Changeset 39016 in vbox for trunk/src/VBox/Additions/WINNT/Graphics/Wine/wined3d/context.c

Timestamp:

Oct 18, 2011 11:41:31 AM (13 years ago)

Author:

vboxsync

Message:

wddm: fix aditional win8 ie rendering issues

File:

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

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

@@ -846 +846 @@
 #ifdef VBOX_WITH_WDDM
         , IWineD3DSwapChainImpl *swapchain
-#endif
+# ifdef DEBUG_misha
+        , BOOL fExpectedValid
+# endif
+#endif
+
         )
 {
 #ifdef VBOX_WITH_WDDM
-    if (!swapchain || context->currentSwapchain == swapchain)
+    if (!swapchain)
+    {
+        swapchain = context->currentSwapchain;
+    }
+
+    if (!swapchain)
+    {
+        context->valid = FALSE;
+# ifdef DEBUG_misha
+        if (fExpectedValid)
+        {
+            ERR("no current swapchain!\n");
+        }
+# endif
+        return;
+    }
+
+    if (swapchain == context->currentSwapchain)
     {
         context->valid = swapchain_validate(context->currentSwapchain);
@@ -882 +903 @@
     IWineD3DSwapChainImpl *swapchain = NULL;
 
-    context_validate(context, NULL);
+    context_validate(context, NULL
+# ifdef DEBUG_misha
+                , FALSE
+# endif
+            );
     if (context->valid)
         return;
@@ -889 +914 @@
     if (swapchain)
     {
-        context_validate(context, swapchain);
+        context_validate(context, swapchain
+# ifdef DEBUG_misha
+                , TRUE
+# endif
+                );
         if (!context->valid)
         {
@@ -1790 +1819 @@
         IWineD3DSwapChain *swapchain = NULL;
         if (target && SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) {
-            context_validate(context, (IWineD3DSwapChainImpl*)swapchain);
+            context_validate(context, (IWineD3DSwapChainImpl*)swapchain
+# ifdef DEBUG_misha
+                , TRUE
+# endif
+                    );
             IWineD3DSwapChain_Release(swapchain);
         }
@@ -2348 +2381 @@
         IWineD3DSwapChain *swapchain = NULL;
         if (SUCCEEDED(IWineD3DSurface_GetContainer(target, &IID_IWineD3DSwapChain, (void **)&swapchain))) {
-            context_validate(context, (IWineD3DSwapChainImpl*)swapchain);
+            context_validate(context, (IWineD3DSwapChainImpl*)swapchain
+# ifdef DEBUG_misha
+                , TRUE
+# endif
+                    );
             IWineD3DSwapChain_Release(swapchain);
         }
@@ -2361 +2398 @@
 
         context = findThreadContextForSwapChain(swapchain);
-        context_validate(context, (IWineD3DSwapChainImpl*)swapchain);
+        context_validate(context, (IWineD3DSwapChainImpl*)swapchain
+# ifdef DEBUG_misha
+                , TRUE
+# endif
+                );
         IWineD3DSwapChain_Release(swapchain);
     }
@@ -2376 +2417 @@
                 swapchain = (IWineD3DSwapChainImpl *)This->swapchains[This->NumberOfSwapChains-1]; /* just fallback to anything to avoid NPE */
             context = findThreadContextForSwapChain((IWineD3DSwapChain*)swapchain);
-            context_validate(context, swapchain);
+            context_validate(context, swapchain
+# ifdef DEBUG_misha
+                , TRUE
+# endif
+                    );
         }