Changeset 23840 in vbox for trunk/src/VBox/HostServices/SharedOpenGL

Timestamp:

Oct 17, 2009 2:51:40 PM (16 years ago)

Author:

vboxsync

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

53598

Message:

crOpenGL: make sure window being destroyed isn't bound to opengl contexts

Location:

trunk/src/VBox/HostServices/SharedOpenGL

Files:

• crserverlib/server_window.c (modified) (2 diffs)
• render/renderspu.c (modified) (3 diffs)

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

@@ -119 +119 @@
 }
 
-void crServerCheckCurrentCtxWindowCB(unsigned long key, void *data1, void *data2)
-{
-    CRContext *crCtx = (CRContext *) data1;
-    GLint window = *(GLint*)data2;
-
-    (void) key;
-}
-
 void SERVER_DISPATCH_APIENTRY
 crServerDispatchWindowDestroy( GLint window )
@@ -194 +186 @@
     }
 
-    crHashtableWalk(cr_server.contextTable, crServerCheckCurrentCtxWindowCB, &window);
     crHashtableDelete(cr_server.pWindowCreateInfoTable, window, crServerCreateInfoDeleteCB);
     crHashtableDelete(cr_server.muralTable, window, crFree);
 }
-
 
 void SERVER_DISPATCH_APIENTRY

trunk/src/VBox/HostServices/SharedOpenGL/render/renderspu.c

@@ -338 +338 @@
 }
 
+static void renderspuCheckCurrentCtxWindowCB(unsigned long key, void *data1, void *data2)
+{
+    ContextInfo *pCtx = (ContextInfo *) data1;
+    WindowInfo *pWindow = data2;
+    (void) key;
+
+    if (pCtx->currentWindow==pWindow)
+    {
+        renderspuMakeCurrent(0, 0, pCtx->id);
+    }    
+}
 
 static void
@@ -343 +354 @@
 {
     WindowInfo *window;
+    GET_CONTEXT(pOldCtx);
+
     CRASSERT(win >= 0);
     window = (WindowInfo *) crHashtableSearch(render_spu.windowTable, win);
@@ -350 +363 @@
         /* remove window info from hash table, and free it */
         crHashtableDelete(render_spu.windowTable, win, crFree);
+
+        /* check if this window is bound to some ctx. Note: window pointer is already freed here */
+        crHashtableWalk(render_spu.contextTable, renderspuCheckCurrentCtxWindowCB, window);
+
+        /* restore current context */
+        {
+            GET_CONTEXT(pNewCtx);
+            if (pNewCtx!=pOldCtx)
+            {
+                renderspuMakeCurrent(pOldCtx&&pOldCtx->currentWindow ? pOldCtx->currentWindow->id:0, 0, 
+                                     pOldCtx ? pOldCtx->id:0);
+            }
+        }
     }
     else {