Changeset 32461 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/arb_program_shader.c

Timestamp:

Sep 13, 2010 5:59:01 PM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine multi-swapchain fixes

File:

• trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/arb_program_shader.c (modified) (4 diffs)

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

@@ -586 +586 @@
 static void shader_arb_load_constants(const struct wined3d_context *context, char usePixelShader, char useVertexShader)
 {
+#ifdef VBOXWDDM
+    IWineD3DDeviceImpl *device = context->device;
+#else
     IWineD3DDeviceImpl *device = context->swapchain->device;
+#endif
     IWineD3DStateBlockImpl* stateBlock = device->stateBlock;
     const struct wined3d_gl_info *gl_info = context->gl_info;
@@ -616 +620 @@
     /* 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 VBOXWDDM
+    if (!context || context->device != This) return;
+#else
     if (!context || context->swapchain->device != This) return;
+#endif
 
     memset(context->vshader_const_dirty + start, 1, sizeof(*context->vshader_const_dirty) * count);
@@ -629 +637 @@
     /* 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 VBOXWDDM
+    if (!context || context->device != This) return;
+#else
     if (!context || context->swapchain->device != This) return;
+#endif
 
     memset(context->pshader_const_dirty + start, 1, sizeof(*context->pshader_const_dirty) * count);
@@ -4349 +4361 @@
 static void shader_arb_select(const struct wined3d_context *context, BOOL usePS, BOOL useVS)
 {
+#ifdef VBOXWDDM
+    IWineD3DDeviceImpl *This = context->device;
+#else
     IWineD3DDeviceImpl *This = context->swapchain->device;
+#endif
     struct shader_arb_priv *priv = This->shader_priv;
     const struct wined3d_gl_info *gl_info = context->gl_info;