Changeset 32508 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine

Timestamp:

Sep 15, 2010 11:15:38 AM (14 years ago)

Author:

vboxsync

Message:

wddm/3d: wine multiswapchain fixes

Location:

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

Files:

• context.c (modified) (9 diffs)
• surface.c (modified) (1 diff)

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

@@ -853 +853 @@
 
     context_validate(context
-#ifdef VBOXWDDM
-            , NULL//context->device->swapchains[0]
+#ifdef VBOXWDDM/* tmp work-around */
+            , context->device->swapchains[context->device->NumberOfSwapChains-1]
 #endif
             );
@@ -1595 +1595 @@
         const struct wined3d_format_desc *ds_format_desc)
 {
-    IWineD3DSwapChainImpl *swapChain = NULL;
     int i, j;
     int swapchains = IWineD3DDevice_GetNumberOfSwapChains(device);
@@ -1605 +1604 @@
     for(i = 0 ; i < swapchains ; i ++)
     {
-        IWineD3DDevice_GetSwapChain(device, i, &swapChain);
-        if (swapChain->ds_format == ds_format_desc)
-        {
-            for(j = 0; j < swapChain->num_contexts; j++) {
-                if(swapChain->context[j]->tid == tid
-                        && swapChain->context[j]->tid == tid) {
-                    context = swapChain->context[j];
+        IWineD3DSwapChainImpl *curSwapChain;
+        IWineD3DDevice_GetSwapChain(device, i, &curSwapChain);
+        if (curSwapChain->ds_format == ds_format_desc)
+        {
+            for(j = 0; j < curSwapChain->num_contexts; j++) {
+                if(curSwapChain->context[j]->tid == tid) {
+                    context = curSwapChain->context[j];
                     break;
                 }
@@ -1621 +1620 @@
         }
 
+        IWineD3DSwapChain_Release(curSwapChain);
+
         if (context)
             break;
-        IWineD3DSwapChain_Release(swapChain);
     }
 
@@ -1633 +1633 @@
     else
     {
-        Assert(swapChain);
-        context_validate(context, swapChain);
+        context_validate(context, swapchain);
         context_setup_target(device, context, target);
         context_enter(context);
         Assert(context->valid);
-        IWineD3DSwapChain_Release(swapChain);
     }
 
@@ -1968 +1966 @@
         else
         {
+#ifdef VBOXWDDM
+            /* tmp work-around */
+            IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->swapchains[This->NumberOfSwapChains-1];
+#else
             IWineD3DSwapChainImpl *swapchain = (IWineD3DSwapChainImpl *)This->swapchains[0];
+#endif
             if (swapchain->backBuffer) target = swapchain->backBuffer[0];
             else target = swapchain->frontBuffer;
@@ -1976 +1979 @@
     if (current_context && current_context->current_rt == target)
     {
-        context_validate(current_context
 #ifdef VBOXWDDM
-                , NULL// current_context->device->swapchains[0]
-#endif
-                                                    );
+        IWineD3DSwapChainImpl *swapchain = NULL;
+        if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) {
+            context_validate(current_context, swapchain);
+            IWineD3DSwapChain_Release(swapchain);
+        }
+        else {
+                                                                                                    /* tmp work-around */
+            context_validate(current_context, current_context->device->swapchains[current_context->device->NumberOfSwapChains-1]);
+        }
+#else
+        context_validate(current_context);
+#endif
         return current_context;
     }
@@ -1988 +1999 @@
 
         context = findThreadContextForSwapChain(swapchain, tid);
-        IWineD3DSwapChain_Release(swapchain);
 #ifdef VBOXWDDM
         context_validate(context, swapchain);
 #endif
+        IWineD3DSwapChain_Release(swapchain);
     }
     else
@@ -2016 +2027 @@
              * Can also happen on thread switches - in that case findThreadContextForSwapChain
              * is perfect to call. */
+#ifdef VBOXWDDM /* tmp work-around */
+            context = findThreadContextForSwapChain(This->swapchains[This->NumberOfSwapChains-1], tid);
+#else
             context = findThreadContextForSwapChain(This->swapchains[0], tid);
+#endif
         }
 #ifdef VBOXWDDM
         context_validate(context,
-                NULL//This->swapchains[0]
+                This->swapchains[This->NumberOfSwapChains-1] /* tmp work-around */
                                  );
 #endif

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

@@ -2137 +2137 @@
             IWineD3DSurfaceImpl *dds_primary;
             IWineD3DSwapChainImpl *swapchain;
+#ifdef VBOXWDDM
+            /* tmp work-around */
+            swapchain = (IWineD3DSwapChainImpl *)This->resource.device->swapchains[This->resource.device->NumberOfSwapChains-1];
+#else
             swapchain = (IWineD3DSwapChainImpl *)This->resource.device->swapchains[0];
+#endif
             dds_primary = (IWineD3DSurfaceImpl *)swapchain->frontBuffer;
             if (dds_primary && dds_primary->palette)