Changeset 35825 in vbox

Timestamp:

Feb 2, 2011 2:11:24 PM (14 years ago)

Author:

vboxsync

Message:

wined3d: bit less ifdefs

Location:

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d

Files:

• arb_program_shader.c (modified) (4 diffs)
• context.c (modified) (7 diffs)
• glsl_shader.c (modified) (2 diffs)
• wined3d_private.h (modified) (1 diff)

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/arb_program_shader.c

@@ -588 +588 @@
 static void shader_arb_load_constants(const struct wined3d_context *context, char usePixelShader, char useVertexShader)
 {
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *device = context->device;
-#else
-    IWineD3DDeviceImpl *device = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *device = context_get_device(context);
     IWineD3DStateBlockImpl* stateBlock = device->stateBlock;
+
     const struct wined3d_gl_info *gl_info = context->gl_info;
 
@@ -622 +619 @@
     /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active
      * context. On a context switch the old context will be fully dirtified */
-#ifdef VBOX_WITH_WDDM
-    if (!context || context->device != This) return;
-#else
-    if (!context || context->swapchain->device != This) return;
-#endif
+    if (!context || context_get_device(context) != This) return;
 
     memset(context->vshader_const_dirty + start, 1, sizeof(*context->vshader_const_dirty) * count);
@@ -639 +632 @@
     /* We don't want shader constant dirtification to be an O(contexts), so just dirtify the active
      * context. On a context switch the old context will be fully dirtified */
-#ifdef VBOX_WITH_WDDM
-    if (!context || context->device != This) return;
-#else
-    if (!context || context->swapchain->device != This) return;
-#endif
+    if (!context || context_get_device(context) != This) return;
 
     memset(context->pshader_const_dirty + start, 1, sizeof(*context->pshader_const_dirty) * count);
@@ -4369 +4358 @@
 static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, BOOL useVS)
 {
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *This = context->device;
-#else
-    IWineD3DDeviceImpl *This = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *This = context_get_device(context);
     struct shader_arb_priv *priv = This->shader_priv;
     const struct wined3d_gl_info *gl_info = context->gl_info;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c

@@ -331 +331 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *device = context->device;
-#else
-    IWineD3DDeviceImpl *device = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *device = context_get_device(context);
     struct fbo_entry *entry;
 
@@ -352 +348 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *device = context->device;
-#else
-    IWineD3DDeviceImpl *device = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *device = context_get_device(context);
 
     context_bind_fbo(context, GL_FRAMEBUFFER, &entry->id);
@@ -385 +377 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *device = context->device;
-#else
-    IWineD3DDeviceImpl *device = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *device = context_get_device(context);
     struct fbo_entry *entry;
 
@@ -425 +413 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *device = context->device;
-#else
-    IWineD3DDeviceImpl *device = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *device = context_get_device(context);
     unsigned int i;
 
@@ -1262 +1246 @@
 }
 
-
+struct IWineD3DDeviceImpl *context_get_device(const struct wined3d_context *context)
+{
+#ifdef VBOX_WITH_WDDM
+    return context->device;
+#else
+    return context->swapchain->device;
+#endif
+}
 
 
@@ -2004 +1995 @@
     {
         if (current_context
-                && current_context->current_rt
-#ifdef VBOX_WITH_WDDM
-                && current_context->device == This
-#else
-                && current_context->swapchain->device == This
-#endif
-                )
+            && current_context->current_rt
+            && context_get_device(current_context) == This
+           )
         {
             target = current_context->current_rt;
@@ -2061 +2048 @@
 
         /* Stay with the currently active context. */
-        if (current_context
-#ifdef VBOX_WITH_WDDM
-                && current_context->device == This
-#else
-                && current_context->swapchain->device == This
-#endif
-                )
+        if (current_context && context_get_device(current_context) == This)
         {
             context = current_context;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/glsl_shader.c

@@ -777 +777 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *device = context->device;
-#else
-    IWineD3DDeviceImpl *device = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *device = context_get_device(context);
     IWineD3DStateBlockImpl* stateBlock = device->stateBlock;
     struct shader_glsl_priv *priv = device->shader_priv;
@@ -4679 +4675 @@
 {
     const struct wined3d_gl_info *gl_info = context->gl_info;
-#ifdef VBOX_WITH_WDDM
-    IWineD3DDeviceImpl *device = context->device;
-#else
-    IWineD3DDeviceImpl *device = context->swapchain->device;
-#endif
+    IWineD3DDeviceImpl *device = context_get_device(context);
     struct shader_glsl_priv *priv = device->shader_priv;
     GLhandleARB program_id = 0;

trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/wined3d_private.h

@@ -1260 +1260 @@
 struct wined3d_context *context_create(IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,
         const struct wined3d_format_desc *ds_format_desc) DECLSPEC_HIDDEN;
+struct IWineD3DDeviceImpl *context_get_device(const struct wined3d_context *context); DECLSPEC_HIDDEN;
 #ifdef VBOX_WITH_WDDM
 struct wined3d_context *context_find_create(IWineD3DDeviceImpl *device, IWineD3DSwapChainImpl *swapchain, IWineD3DSurfaceImpl *target,