Changeset 21127 in vbox

Timestamp:

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

Author:

vboxsync

Message:

crOpenGL: fix window/context management for multithreaded apps

Location:

trunk/src/VBox

Files:

• Additions/common/crOpenGL/pack/packspu_context.c (modified) (4 diffs)
• Additions/common/crOpenGL/pack/packspu_misc.c (modified) (2 diffs)
• HostServices/SharedOpenGL/crserverlib/server_context.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_stream.c (modified) (3 diffs)
• HostServices/SharedOpenGL/crserverlib/server_window.c (modified) (4 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++;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_context.c

@@ -140 +140 @@
         for (pos = 0; pos < CR_MAX_CONTEXTS; ++pos)
             if (cr_server.curClient->contextList[pos] == ctx)
+            {
                 cr_server.curClient->contextList[pos] = 0;
+                break;
+            }
+        CRASSERT(pos<CR_MAX_CONTEXTS);
     }
 }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_stream.c

@@ -116 +116 @@
     int i, j;
     int32_t pos;
-
-    crDebug("Deleting client %p (%d msgs left)", client,
-                    crNetNumMessages(client->conn));
+    CRClient *oldclient = cr_server.curClient;
+
+    crDebug("Deleting client %p (%d msgs left)", client, crNetNumMessages(client->conn));
 
 #if 0
@@ -142 +142 @@
         }
     }
+
+    cr_server.curClient = client;
+
+    /* Destroy any windows created by the client */
+    for (pos = 0; pos<CR_MAX_WINDOWS && client->windowList[pos]; pos++) 
+    {
+        cr_server.dispatch.WindowDestroy(client->windowList[pos]);
+    }
+
+    /* Check if we have context(s) made by this client left, could happen if client side code is lazy */
+    for (pos = 0; pos<CR_MAX_CONTEXTS && client->contextList[pos]; pos++) 
+    {
+        cr_server.dispatch.DestroyContext(client->contextList[pos]);
+    }
+
+    cr_server.curClient = oldclient;
 
     /* remove from the run queue */
@@ -179 +195 @@
 
     crNetFreeConnection(client->conn);
-
-    /* Destroy any windows created by the client */
-    for (pos = 0; pos<CR_MAX_WINDOWS && client->windowList[pos]; pos++) 
-    {
-        cr_server.dispatch.WindowDestroy(client->windowList[pos]);
-    }
-
-    /* Check if we have context(s) made by this client left, could happen if client side code is lazy */
-    for (pos = 0; pos<CR_MAX_CONTEXTS && client->contextList[pos]; pos++) 
-    {
-        cr_server.dispatch.DestroyContext(client->contextList[pos]);
-    }
 
     crFree(client);

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

@@ -119 +119 @@
 }
 
-
-#define EXTRA_WARN 0
+void crServerCheckCurrentCtxWindowCB(unsigned long key, void *data1, void *data2)
+{
+    CRContext *crCtx = (CRContext *) data1;
+    GLint window = *(GLint*)data2;
+
+    (void) key;
+}
 
 void SERVER_DISPATCH_APIENTRY
@@ -130 +135 @@
     mural = (CRMuralInfo *) crHashtableSearch(cr_server.muralTable, window);
     if (!mural) {
-#if EXTRA_WARN
          crWarning("CRServer: invalid window %d passed to WindowDestroy()", window);
-#endif
          return;
     }
@@ -143 +146 @@
         for (pos = 0; pos < CR_MAX_WINDOWS; ++pos)
             if (cr_server.curClient->windowList[pos] == window)
+            {
                 cr_server.curClient->windowList[pos] = 0;
+                break;
+            }
+        CRASSERT(pos<CR_MAX_WINDOWS);
 
         if (cr_server.curClient->currentMural == mural)
@@ -152 +159 @@
     }
 
+    if (cr_server.currentWindow = window)
+    {
+        cr_server.currentWindow = -1;
+    }
+
+    crHashtableWalk(cr_server.contextTable, crServerCheckCurrentCtxWindowCB, &window);
     crHashtableDelete(cr_server.pWindowCreateInfoTable, window, crServerCreateInfoDeleteCB);
-    /* @todo, can't issue it cause we could have context(s) referencing this one left */
-    /*crHashtableDelete(cr_server.muralTable, window, crFree);*/
+    crHashtableDelete(cr_server.muralTable, window, crFree);
 }