Changeset 44389 in vbox

Timestamp:

Jan 25, 2013 6:38:32 PM (12 years ago)

Author:

vboxsync

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

83360

Message:

crOpenGL: window destuction fix

Location:

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Files:

• server_context.c (modified) (3 diffs)
• server_window.c (modified) (2 diffs)

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

@@ -179 +179 @@
     CRClientNode *pNode;
     int found=false;
+    int spuContext;
 
     crCtxInfo = (CRContextInfo *) crHashtableSearch(cr_server.contextTable, ctx);
@@ -198 +199 @@
         crFree(crCtxInfo->CreateInfo.pszDpyName);
 
-    if (crCtxInfo->SpuContext >= 0)
-        cr_server.head_spu->dispatch_table.DestroyContext(crCtxInfo->SpuContext);
+    spuContext = crCtxInfo->SpuContext;
 
     crFree(crCtxInfo);
@@ -266 +266 @@
         cr_server.currentCtxInfo = &cr_server.MainContextInfo;
     }
+
+    if (spuContext >= 0)
+        cr_server.head_spu->dispatch_table.DestroyContext(spuContext);
 }
 

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

@@ -168 +168 @@
     crServerDeleteMuralFBO(mural);
 
+    if (cr_server.currentMural == mural)
+    {
+        CRMuralInfo *dummyMural = crServerGetDummyMural(cr_server.MainContextInfo.CreateInfo.visualBits);
+        /* reset the current context to some dummy values to ensure render spu does not switch to a default "0" context,
+         * which might lead to muralFBO (offscreen rendering) gl entities being created in a scope of that context */
+        cr_server.head_spu->dispatch_table.MakeCurrent(dummyMural->spuWindow, 0, cr_server.MainContextInfo.SpuContext);
+        cr_server.currentWindow = -1;
+        cr_server.currentMural = NULL;
+    }
+    else
+    {
+        CRASSERT(cr_server.currentWindow != mural->CreateInfo.externalID);
+    }
+
+
     cr_server.head_spu->dispatch_table.WindowDestroy( mural->spuWindow );
 
@@ -214 +229 @@
     crServerMuralTerm(mural);
 
-    if (cr_server.currentWindow == window)
-    {
-        cr_server.currentWindow = -1;
-        CRASSERT(cr_server.currentMural == mural);
-        cr_server.currentMural = NULL;
-    }
-    else
-    {
-        CRASSERT(cr_server.currentMural != mural);
-    }
+    CRASSERT(cr_server.currentWindow != window);
 
     if (cr_server.curClient)