Changeset 39602 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Dec 14, 2011 11:12:17 AM (13 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

75376

Message:

wine/XPDM: 1. Additional swapchain creation fixes 2. De-libwine'ize wined3d 3. Single context per swapchain 4. wine & crOgl current context sync fixes 5. Proper Get/ReleaseDC handling

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• context.c (modified) (2 diffs)
• load.c (modified) (5 diffs)
• stub.h (modified) (4 diffs)

trunk/src/VBox/Additions/common/crOpenGL/context.c

@@ -397 +397 @@
 
 #ifdef CHROMIUM_THREADSAFE
-    crTSDRefInit(context, stubContextDtor);
+    VBoxTlsRefInit(context, stubContextDtor);
 #endif
 
@@ -1192 +1192 @@
     }
 
-    crTSDRefRelease(context);
+    VBoxTlsRefRelease(context);
 #else
     stubDestroyContextLocked(context);

trunk/src/VBox/Additions/common/crOpenGL/load.c

@@ -27 +27 @@
 # include <unistd.h>
 #endif
-#ifdef CHROMIUM_THREADSAFE
-#include "cr_threads.h"
-#endif
 
 #ifdef VBOX_WITH_WDDM
@@ -69 +66 @@
 Stub stub;
 #ifdef CHROMIUM_THREADSAFE
+static bool g_stubIsCurrentContextTSDInited;
 CRtsd g_stubCurrentContextTSD;
 #endif
@@ -510 +508 @@
     exit(0);  /* this causes stubExitHandler() to be called */
 }
+
+#ifndef RT_OS_WINDOWS
+# ifdef CHROMIUM_THREADSAFE
+static DECLCALLBACK(void) stubThreadTlsDtor(void *pvValue)
+{
+    ContextInfo *pCtx = (ContextInfo*)pvValue;
+    VBoxTlsRefRelease(pCtx);
+}
+# endif
+#endif
 
 
@@ -547 +555 @@
 #ifndef RT_OS_WINDOWS
 # ifdef CHROMIUM_THREADSAFE
-    crInitTSD(&g_stubCurrentContextTSD);
+    if (!g_stubIsCurrentContextTSDInited)
+    {
+        crInitTSDF(&g_stubCurrentContextTSD, stubThreadTlsDtor);
+        g_stubIsCurrentContextTSDInited = true;
+    }
 # endif
 #endif
@@ -1411 +1423 @@
         stubSPUSafeTearDown();
 
+#ifdef CHROMIUM_THREADSAFE
+        crFreeTSD(&g_stubCurrentContextTSD);
+#endif
+
 #ifdef VDBG_VEHANDLER
         vboxVDbgVEHandlerUnregister();
 #endif
-
         break;
     }

trunk/src/VBox/Additions/common/crOpenGL/stub.h

@@ -56 +56 @@
 #endif
 
+#ifdef CHROMIUM_THREADSAFE
+# include <cr_threads.h>
+#endif
 /*#define VBOX_TEST_MEGOO*/
 
@@ -113 +116 @@
 
 #ifdef CHROMIUM_THREADSAFE
-    CRTSDREFDATA
+    VBOXTLSREFDATA
 #endif
 
@@ -265 +268 @@
 
 #ifdef CHROMIUM_THREADSAFE
-# define stubGetCurrentContext() crTSDRefGetCurrent(ContextInfo, &g_stubCurrentContextTSD)
-# define stubSetCurrentContext(_ctx) crTSDRefSetCurrent(ContextInfo, &g_stubCurrentContextTSD, _ctx)
-#else
-# define stubGetCurrentContext() (stub.currentContext)
-# define stubSetCurrentContext(_ctx) do { stub.currentContext = (_ctx); } while (0)
-#endif
-
-extern Stub stub;
-/* we place the __currentContextTSD outside the Stub data because Stub data is inited by the client's call,
- * while we need __currentContextTSD the __currentContextTSD to be valid at any time to be able to handle
+/* we place the g_stubCurrentContextTLS outside the Stub data because Stub data is inited by the client's call,
+ * while we need g_stubCurrentContextTLS the g_stubCurrentContextTLS to be valid at any time to be able to handle
  * THREAD_DETACH cleanup on windows.
  * Note that we can not do
@@ -284 +279 @@
  * Note that GetModuleFileName acquires the loader lock.
  * */
-#ifdef CHROMIUM_THREADSAFE
 extern CRtsd g_stubCurrentContextTSD;
-#endif
+
+# define stubGetCurrentContext() VBoxTlsRefGetCurrent(ContextInfo, &g_stubCurrentContextTSD)
+# define stubSetCurrentContext(_ctx) VBoxTlsRefSetCurrent(ContextInfo, &g_stubCurrentContextTSD, _ctx)
+#else
+# define stubGetCurrentContext() (stub.currentContext)
+# define stubSetCurrentContext(_ctx) do { stub.currentContext = (_ctx); } while (0)
+#endif
+
+extern Stub stub;
+
 extern DECLEXPORT(SPUDispatchTable) glim;
 extern SPUDispatchTable stubThreadsafeDispatch;