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

Timestamp:

Jul 1, 2009 2:25:14 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: fix window/context management for multithreaded apps

Location:

trunk/src/VBox/Additions/common/crOpenGL/pack

Files:

• packspu_context.c (modified) (4 diffs)
• packspu_misc.c (modified) (2 diffs)

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_context.c

@@ -82 +82 @@
 packspu_CreateContext( const char *dpyName, GLint visual, GLint shareCtx )
 {
+    GET_THREAD(thread);
     int writeback = 1;
     GLint serverCtx = (GLint) -1;
@@ -89 +90 @@
     crLockMutex(&_PackMutex);
 #endif
+
+    if (!thread) {
+        thread = packspuNewThread(crThreadID());
+    }
+    CRASSERT(thread);
+    CRASSERT(thread->packer);
 
     if (shareCtx > 0) {
@@ -98 +105 @@
     }
 
-    crPackSetContext( pack_spu.thread[0].packer );
+    crPackSetContext( thread->packer );
 
     /* Pack the command */
@@ -107 +114 @@
 
     /* Flush buffer and get return value */
-    packspuFlush( &(pack_spu.thread[0]) );
-    if (!(pack_spu.thread[0].netServer.conn->actual_network))
+    packspuFlush(thread);
+    if (!(thread->netServer.conn->actual_network))
     {
         /* HUMUNGOUS HACK TO MATCH SERVER NUMBERING

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -112 +112 @@
 GLint PACKSPU_APIENTRY packspu_WindowCreate( const char *dpyName, GLint visBits )
 {
+    GET_THREAD(thread);
     static int num_calls = 0;
     int writeback = pack_spu.thread[0].netServer.conn->actual_network;
     GLint return_val = (GLint) 0;
 
-    /* WindowCreate is special - just like CreateContext.
-     * GET_THREAD(thread) doesn't work as the thread won't have called
-     * MakeCurrent yet, so we've got to use the first thread's packer
-     * buffer.
-     */
-
-    crPackSetContext( pack_spu.thread[0].packer );
+    if (!thread) {
+        thread = packspuNewThread( crThreadID() );
+    }
+    CRASSERT(thread);
+    CRASSERT(thread->packer);
+
+    crPackSetContext(thread->packer);
 
     if (pack_spu.swap)
@@ -132 +133 @@
         crPackWindowCreate( dpyName, visBits, &return_val, &writeback );
     }
-    packspuFlush( &pack_spu.thread[0] );
-    if (!(pack_spu.thread[0].netServer.conn->actual_network))
+    packspuFlush(thread);
+    if (!(thread->netServer.conn->actual_network))
     {
         return num_calls++;