Changeset 39631 in vbox for trunk/src

Timestamp:

Dec 15, 2011 4:09:12 PM (13 years ago)

Author:

vboxsync

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

75426

Message:

crOpenGL: context & window destroy fixes

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• context.c (modified) (3 diffs)
• load.c (modified) (1 diff)
• stub.c (modified) (2 diffs)

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

@@ -346 +346 @@
 static DECLCALLBACK(void) stubContextDtor(void*pvContext)
 {
+    crHashtableLock(stub.windowTable);
     crHashtableLock(stub.contextTable);
     stubDestroyContextLocked((ContextInfo*)pvContext);
     crHashtableUnlock(stub.contextTable);
+    crHashtableUnlock(stub.windowTable);
 }
 #endif
@@ -1181 +1183 @@
     }
 
+    /* the lock order is windowTable->contextTable (see wglMakeCurrent_prox, glXMakeCurrent)
+     * this is why we need to take a windowTable lock since we will later do stub.windowTable access & locking */
+    crHashtableLock(stub.windowTable);
     crHashtableLock(stub.contextTable);
 
@@ -1201 +1206 @@
 #endif
     crHashtableUnlock(stub.contextTable);
+    crHashtableUnlock(stub.windowTable);
 }
 

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

@@ -340 +340 @@
     //delete all created contexts
     stubMakeCurrent( NULL, NULL);
+
+    /* the lock order is windowTable->contextTable (see wglMakeCurrent_prox, glXMakeCurrent)
+     * this is why we need to take a windowTable lock since we will later do stub.windowTable access & locking */
+    crHashtableLock(stub.windowTable);
     crHashtableWalk(stub.contextTable, hsWalkStubDestroyContexts, NULL);
+    crHashtableUnlock(stub.windowTable);
 
     /* shutdown, now trap any calls to a NULL dispatcher */

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

@@ -125 +125 @@
 }
 
+static void stubWindowCleanupForContextsCB(unsigned long key, void *data1, void *data2)
+{
+    ContextInfo *context = (ContextInfo *) data1;
+
+    CRASSERT(context);
+
+    if (context->currentDrawable == data2)
+        context->currentDrawable = NULL;
+}
+
 void APIENTRY crWindowDestroy( GLint window )
 {
@@ -153 +163 @@
 #endif
         crForcedFlush();
+
+        crHashtableWalk(stub.contextTable, stubWindowCleanupForContextsCB, winInfo);
+
         crHashtableDelete(stub.windowTable, window, crFree);