Changeset 26545 in vbox

Timestamp:

Feb 15, 2010 2:26:57 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix assertion when application uses several windows with single opengl context (#4598)

File:

• trunk/src/VBox/Additions/common/crOpenGL/context.c (modified) (4 diffs)

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

@@ -32 +32 @@
 #include "stub.h"
 
+typedef struct {
+    WindowInfo *window;
+    GLboolean   windowInUse;
+} CtxCheckCurrentDrawableParams_t;
 
 /**
@@ -786 +790 @@
 }
 
+static void stubCtxCheckCurrentDrawableCB(unsigned long key, void *data1, void *data2)
+{
+    ContextInfo *pCtx = (ContextInfo *) data1;
+    CtxCheckCurrentDrawableParams_t *pParams = (CtxCheckCurrentDrawableParams_t *) data2;
+
+    if (pCtx->currentDrawable == pParams->window)
+    {
+        pParams->windowInUse = GL_TRUE;
+    }
+}
 
 GLboolean
@@ -835 +849 @@
             if (window->spuWindow == -1)
             {
+                /*crDebug("(1)stubMakeCurrent ctx=%p(%i) window=%p(%i)", context, context->spuContext, window, window->spuWindow);*/
                 window->spuWindow = stub.spu->dispatch_table.WindowCreate( window->dpyName, context->visBits );
                 CRASSERT(!context->pOwnWindow);
@@ -891 +906 @@
             if (window->spuWindow == -1)
             {
+                /*crDebug("(2)stubMakeCurrent ctx=%p(%i) window=%p(%i)", context, context->spuContext, window, window->spuWindow);*/
                 window->spuWindow = stub.spu->dispatch_table.WindowCreate( window->dpyName, context->visBits );
-                CRASSERT(!context->pOwnWindow);
+                if (context->pOwnWindow)
+                {
+                    WindowInfo *pOwnWindow = context->pOwnWindow;
+                    CtxCheckCurrentDrawableParams_t params;
+
+                    context->pOwnWindow = NULL;
+                    context->currentDrawable=NULL;
+
+                    params.window = pOwnWindow;
+                    params.windowInUse = GL_FALSE;
+
+                    crHashtableWalk(stub.contextTable, stubCtxCheckCurrentDrawableCB, &params);
+
+                    if (!params.windowInUse)
+                    {
+#ifdef WINDOWS
+                        crWindowDestroy((GLint)pOwnWindow->hWnd);
+#else
+                        crWindowDestroy((GLint)pOwnWindow->drawable);
+#endif
+                    }
+                }
                 context->pOwnWindow = window;
             }