Changeset 39869 in vbox for trunk/src/VBox/Additions/WINNT

Timestamp:

Jan 25, 2012 7:02:14 AM (13 years ago)

Author:

vboxsync

Message:

wine/d3d: proper habdling of context destruction and tls stuff

Location:

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

Files:

• context.c (modified) (4 diffs)
• swapchain.c (modified) (2 diffs)

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

@@ -1082 +1082 @@
 {
     struct wined3d_context *ctx = vboxGetCurrentContext();
+    if (ctx && !VBoxTlsRefIsFunctional(ctx))
+    {
+        /* this is a destroyed context left in the tls of the current thread */
+        /* 1. this releases the context and clears the tls */
+        vboxSetCurrentContext(NULL);
+        /* return there is no context current */
+        return NULL;
+    }
     if (!adjustTid)
         return ctx;
@@ -1505 +1513 @@
 {
     struct wined3d_context * context = (struct wined3d_context *)pvCtx;
-    context_destroy_gl_resources(context);
     HeapFree(GetProcessHeap(), 0, context);
 }
@@ -1993 +2000 @@
         destroy = FALSE;
     }
+#else
+    context_destroy_gl_resources(context);
 #endif
 
@@ -1998 +2007 @@
     HeapFree(GetProcessHeap(), 0, context->pshader_const_dirty);
     device_context_remove(This, context);
-#ifndef VBOX_WITH_WDDM
-    context->swapchain = NULL;
-#endif
 #if !defined(VBOX_WINE_WITH_SINGLE_CONTEXT) && !defined(VBOX_WINE_WITH_SINGLE_SWAPCHAIN_CONTEXT)
     if (destroy) HeapFree(GetProcessHeap(), 0, context);
 #else
+# ifndef VBOX_WITH_WDDM
+    context->swapchain = NULL;
+#else
+    context->currentSwapchain = NULL;
+    context->device = NULL;
+# endif
+    VBoxTlsRefMarkDestroy(context);
     VBoxTlsRefRelease(context);
 #endif

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

@@ -139 +139 @@
         This->backBuffer = NULL;
     }
-#if 0
+#ifndef VBOX_WINE_WITH_SINGLE_CONTEXT
     for (i = 0; i < This->num_contexts; ++i)
     {
         context_destroy(This->device, This->context[i]);
     }
-#else
+#endif
 
 #ifdef VBOX_WITH_WDDM
@@ -158 +158 @@
     IWineD3DDevice_RemoveSwapChain((IWineD3DDevice*)This->device, (IWineD3DSwapChain*)This);
     if (!This->device->NumberOfSwapChains)
-#endif
     {
         /* Restore the screen resolution if we rendered in fullscreen