Changeset 26909 in vbox for trunk/src/VBox/Additions/common/crOpenGL

Timestamp:

Mar 1, 2010 1:20:27 PM (15 years ago)

Author:

vboxsync

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

58193

Message:

crOpenGL: fix flickering when opengl context is used with multiply windows

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• context.c (modified) (9 diffs)
• load.c (modified) (6 diffs)
• stub.h (modified) (2 diffs)

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

@@ -220 +220 @@
     winInfo->spuWindow = -1;
     winInfo->mapped = -1; /* don't know */
+    winInfo->pOwner = NULL;
 #ifndef WINDOWS
     crHashtableAdd(stub.windowTable, (unsigned int) drawable, winInfo);
@@ -271 +272 @@
     context->visBits = visBits;
     context->currentDrawable = NULL;
-    context->pOwnWindow = NULL;
     crStrncpy(context->dpyName, dpyName, MAX_DPY_NAME);
     context->dpyName[MAX_DPY_NAME-1] = 0;
@@ -790 +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)
+static void stubWindowCheckOwnerCB(unsigned long key, void *data1, void *data2)
+{
+    WindowInfo *pWindow = (WindowInfo *) data1;
+    ContextInfo *pCtx = (ContextInfo *) data2;
+
+    if (pWindow->pOwner == pCtx)
     {
-        pParams->windowInUse = GL_TRUE;
+#ifdef WINDOWS
+            /* Note: can't use WindowFromDC(context->pOwnWindow->drawable) here
+               because GL context is already released from DC and actual guest window
+               could be destroyed.
+             */
+            crWindowDestroy((GLint)pWindow->hWnd);
+#else
+            crWindowDestroy((GLint)pWindow->drawable);
+#endif
     }
 }
@@ -851 +859 @@
                 /*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);
-                context->pOwnWindow = window;
             }
         }
@@ -896 +902 @@
         CRASSERT(context->spuContext >= 0);
 
-        if (context->currentDrawable && context->currentDrawable != window)
-            crWarning("Rebinding context %p to a different window", context);
+        /*if (context->currentDrawable && context->currentDrawable != window)
+            crDebug("Rebinding context %p to a different window", context);*/
 
         if (window->type == NATIVE) {
@@ -908 +914 @@
                 /*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 );
-                if (context->pOwnWindow)
+                if (context->currentDrawable && context->currentDrawable->type==CHROMIUM 
+                    && context->currentDrawable->pOwner==context)
                 {
-                    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);
+                        if (!WindowFromDC(context->currentDrawable->drawable))
+                        {
+                            crWindowDestroy((GLint)context->currentDrawable->hWnd);
+                        }
 #else
-                        crWindowDestroy((GLint)pOwnWindow->drawable);
-#endif
-                    }
+                        Window root;
+                        int x, y;
+                        unsigned int border, depth, w, h;
+
+                        if (!XGetGeometry(context->currentDrawable->dpy, context->currentDrawable->drawable, &root, &x, &y, &w, &h, &border, &depth))
+                        {
+                            crWindowDestroy((GLint)context->currentDrawable->drawable);
+                        }
+#endif
+                    
                 }
-                context->pOwnWindow = window;
             }
 
@@ -943 +946 @@
 
     window->type = context->type;
+    window->pOwner = context;
     context->currentDrawable = window;
     stub.currentContext = context;
@@ -1002 +1006 @@
 }
 
-
-
 void
 stubDestroyContext( unsigned long contextId )
@@ -1029 +1031 @@
         CRASSERT(context->spuContext >= 0);
         stub.spu->dispatch_table.DestroyContext( context->spuContext );
-        if (context->pOwnWindow)
-        {
-            /* Note: can't use WindowFromDC(context->pOwnWindow->drawable) here
-               because GL context is already released from DC and actual guest window
-               could be destroyed.
-             */
-#ifdef WINDOWS
-            crWindowDestroy((GLint)context->pOwnWindow->hWnd);
-#else
-            crWindowDestroy((GLint)context->pOwnWindow->drawable);
-#endif
-        }
+        crHashtableWalk(stub.windowTable, stubWindowCheckOwnerCB, context);
     }
 

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

@@ -80 +80 @@
 static ScissorFunc_t origScissor;
 
-static void stubCheckWindowState(void)
-{
-    WindowInfo *window;
+static void stubCheckWindowState(WindowInfo *window)
+{
     bool bForceUpdate = false;
-
-    CRASSERT(stub.trackWindowSize || stub.trackWindowPos);
-
-    if (!stub.currentContext)
-        return;
-
-    window = stub.currentContext->currentDrawable;
 
 #ifdef WINDOWS
@@ -129 +121 @@
 }
 
+static bool stubSystemWindowExist(WindowInfo *pWindow)
+{
+#ifdef WINDOWS
+    if (!WindowFromDC(pWindow->drawable))
+    {
+        return false;
+    }
+#else
+    Window root;
+    int x, y;
+    unsigned int border, depth, w, h;
+
+    if (!XGetGeometry(pWindow->dpy, pWindow->drawable, &root, &x, &y, &w, &h, &border, &depth))
+    {
+        return false;
+    }
+#endif
+
+    return true;
+}
+
+static void stubCheckWindowsCB(unsigned long key, void *data1, void *data2)
+{
+    WindowInfo *pWindow = (WindowInfo *) data1;
+    ContextInfo *pCtx = (ContextInfo *) data2;
+
+    if (pWindow == pCtx->currentDrawable
+        || pWindow->type!=CHROMIUM
+        || pWindow->pOwner!=pCtx)
+    {
+        return;
+    }
+
+    if (!stubSystemWindowExist(pWindow))
+    {
+#ifdef WINDOWS
+        crWindowDestroy((GLint)pWindow->hWnd);
+#else
+        crWindowDestroy((GLint)pWindow->drawable);
+#endif
+        return;
+    }
+
+    stubCheckWindowState(pWindow);
+}
+
+static void stubCheckWindowsState(void)
+{
+    CRASSERT(stub.trackWindowSize || stub.trackWindowPos);
+
+    if (!stub.currentContext)
+        return;
+
+    stubCheckWindowState(stub.currentContext->currentDrawable);
+
+    crHashtableWalk(stub.windowTable, stubCheckWindowsCB, stub.currentContext);
+}
+
 
 /**
@@ -137 +187 @@
 static void SPU_APIENTRY trapClear(GLbitfield mask)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     /* call the original SPU glClear function */
     origClear(mask);
@@ -148 +198 @@
 static void SPU_APIENTRY trapViewport(GLint x, GLint y, GLsizei w, GLsizei h)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     /* call the original SPU glViewport function */
     if (!stub.viewportHack)
@@ -167 +217 @@
 static void SPU_APIENTRY trapSwapBuffers(GLint window, GLint flags)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     origSwapBuffers(window, flags);
 }
@@ -173 +223 @@
 static void SPU_APIENTRY trapDrawBuffer(GLenum buf)
 {
-    stubCheckWindowState();
+    stubCheckWindowsState();
     origDrawBuffer(buf);
 }

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

@@ -92 +92 @@
     GLint visBits;
     WindowInfo *currentDrawable;
-    WindowInfo *pOwnWindow; /* window created by first call to MakeCurrent with this context */
+
 #ifdef WINDOWS
     HGLRC hglrc;
@@ -137 +137 @@
     ContextType type;
     GLint spuWindow;       /* returned by head SPU's WindowCreate() */
+    ContextInfo *pOwner;     /* ctx which created this window */
     GLboolean mapped;
 #ifdef WINDOWS