Changeset 16480 in vbox for trunk/src/VBox

Timestamp:

Feb 3, 2009 10:31:14 AM (16 years ago)

Author:

vboxsync

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

42370

Message:

crOpenGL: track visible regions on linux guests + some more exports

Location:

trunk/src/VBox

Files:

• Additions/WINNT/Graphics/crOpenGL/Makefile.kmk (modified) (1 diff)
• Additions/WINNT/Graphics/crOpenGL/context.c (modified) (2 diffs)
• Additions/WINNT/Graphics/crOpenGL/load.c (modified) (3 diffs)
• Additions/WINNT/Graphics/crOpenGL/stub.c (modified) (3 diffs)
• Additions/WINNT/Graphics/crOpenGL/stub.h (modified) (3 diffs)
• GuestHost/OpenGL/packer/pack_visibleregion.c (modified) (2 diffs)

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/Makefile.kmk

@@ -143 +143 @@
         $(VBOX_LIB_VBGL_R3) \
         $(PATH_LIB)/additions/VBoxOGLspuload$(VBOX_SUFF_LIB) \
-        $(VBOX_PATH_ADDITIONS)/VBoxOGLcrutil$(VBOX_SUFF_DLL)
+        $(VBOX_PATH_ADDITIONS)/VBoxOGLcrutil$(VBOX_SUFF_DLL) \
+        Xcomposite
 endif
 

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/context.c

@@ -138 +138 @@
 #elif defined(GLX)
     winInfo->drawable = (GLXDrawable) spuWin;
+    winInfo->pVisibleRegions = NULL;
 #endif
     winInfo->spuWindow = spuWin;
@@ -203 +204 @@
     winInfo->dpyName[MAX_DPY_NAME-1] = 0;
     winInfo->dpy = dpy;
+    winInfo->pVisibleRegions = NULL;
 #elif defined(Darwin)
     winInfo->connection = _CGSDefaultConnection(); // store our connection as default

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/load.c

@@ -75 +75 @@
 static ViewportFunc_t origViewport;
 
-
 static void stubCheckWindowState(void)
 {
@@ -112 +111 @@
     stubUpdateWindowGeometry(window, bForceUpdate);
 
-#ifdef WINDOWS
+#if defined(GLX) || defined (WINDOWS)
     if (stub.trackWindowVisibleRgn)
     {
@@ -288 +287 @@
 #ifdef WINDOWS
     defaultWin->hVisibleRegion = INVALID_HANDLE_VALUE;
+#elif defined(GLX)
+    defaultWin->pVisibleRegions = NULL;
 #endif
     crHashtableAdd(stub.windowTable, 0, defaultWin);

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/stub.c

@@ -9 +9 @@
 #include "cr_mem.h" 
 #include "stub.h"
+
+#ifdef GLX
+#include <X11/extensions/Xcomposite.h>
+#include <X11/extensions/Xfixes.h>
+#endif
 
 /**
@@ -88 +93 @@
         {
             DeleteObject(winInfo->hVisibleRegion);
+        }
+#elif defined(GLX)
+        if (winInfo->pVisibleRegions)
+        {
+            XFree(winInfo->pVisibleRegions);
         }
 #endif
@@ -380 +390 @@
         UnhookWindowsHookEx(stub.hMessageHook);
 }
-#endif
+#elif defined(GLX) //#ifdef WINDOWS
+static GLboolean stubCheckXExtensions(WindowInfo *pWindow)
+{
+    int evb, erb, vmi=0, vma=0;
+
+    if (XCompositeQueryExtension(pWindow->dpy, &evb, &erb) 
+        && XCompositeQueryVersion(pWindow->dpy, &vma, &vmi) 
+        && (vma>0 || vmi>=4))
+    {
+        crDebug("XComposite %i.%i", vma, vmi);
+        vma=0;
+        vmi=0;
+        if (XFixesQueryExtension(pWindow->dpy, &evb, &erb) 
+            && XFixesQueryVersion(pWindow->dpy, &vma, &vmi)
+            && vma>=2)
+        {
+            crDebug("XFixes %i.%i", vma, vmi);
+            return GL_TRUE;
+        }
+        else
+        {
+            crWarning("XFixes not found or old version (%i.%i), no VisibilityTracking", vma, vmi);
+        }
+    }
+    else
+    {
+        crWarning("XComposite not found or old version (%i.%i), no VisibilityTracking", vma, vmi);
+    }
+    return GL_FALSE;
+}
+
+/*
+ *  Updates visible regions for given spu window.
+ *  Returns GL_TRUE if regions changed since last call, GL_FALSE overwise.
+ */
+GLboolean stubUpdateWindowVisibileRegions(WindowInfo *pWindow)
+{
+    static GLboolean bExtensionsChecked = GL_FALSE;
+
+    XserverRegion xreg;
+    int cRects, i;
+    XRectangle *pXRects;
+    GLint* pGLRects;
+
+    if (bExtensionsChecked || stubCheckXExtensions(pWindow))
+    {
+        bExtensionsChecked = GL_TRUE;
+    }
+    else
+    {
+        stub.trackWindowVisibleRgn = 0;
+        return GL_FALSE;
+    }
+
+    /*@todo see comment regarding size/position updates and XSync, same applies to those functions but
+    * it seems there's no way to get even based updates for this. Or I've failed to find the appropriate extension.
+    */
+    xreg = XCompositeCreateRegionFromBorderClip(pWindow->dpy, pWindow->drawable);
+    pXRects = XFixesFetchRegion(pWindow->dpy, xreg, &cRects);
+    XFixesDestroyRegion(pWindow->dpy, xreg);
+
+    if (!pWindow->pVisibleRegions 
+        || pWindow->cVisibleRegions!=cRects 
+        || crMemcmp(pWindow->pVisibleRegions, pXRects, cRects * sizeof(XRectangle)))
+    {
+        pWindow->pVisibleRegions = pXRects;
+        pWindow->cVisibleRegions = cRects;
+
+        pGLRects = crAlloc(4*cRects*sizeof(GLint));
+        if (!pGLRects)
+        {
+            crWarning("stubUpdateWindowVisibileRegions: failed to allocate %i bytes", 4*cRects*sizeof(GLint));
+            return GL_FALSE;
+        }
+
+        /*crDebug("Got %i rects.", cRects);*/
+        for (i=0; i<cRects; ++i)
+        {
+            pGLRects[4*i+0] = pXRects[i].x;
+            pGLRects[4*i+1] = pXRects[i].y;
+            pGLRects[4*i+2] = pXRects[i].x+pXRects[i].width;
+            pGLRects[4*i+3] = pXRects[i].y+pXRects[i].height;
+            /*crDebug("Rect[%i]=(%i,%i,%i,%i)", i, pGLRects[4*i+0], pGLRects[4*i+1], pGLRects[4*i+2], pGLRects[4*i+3]);*/                   
+        }
+
+        crDebug("Dispatched WindowVisibleRegion (%i, cRects=%i)", pWindow->spuWindow, cRects);
+        stub.spuDispatch.WindowVisibleRegion(pWindow->spuWindow, cRects, pGLRects);
+        crFree(pGLRects);
+        return GL_TRUE;
+    }
+    else
+    {
+        XFree(pXRects);
+    }
+
+    return GL_FALSE;
+}
+#endif //#ifdef WINDOWS

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL/stub.h

@@ -122 +122 @@
     Display *dpy;
     GLXDrawable drawable;
+    XRectangle *pVisibleRegions;
+    GLint cVisibleRegions;
 #endif
 };
@@ -183 +185 @@
 extern DECLEXPORT(SPUDispatchTable) stubNULLDispatch;
 
+#if defined(GLX) || defined (WINDOWS)
+extern GLboolean stubUpdateWindowVisibileRegions(WindowInfo *pWindow);
+#endif
 
 #ifdef WINDOWS
@@ -191 +196 @@
 extern void stubInstallWindowMessageHook();
 extern void stubUninstallWindowMessageHook();
-
-extern GLboolean stubUpdateWindowVisibileRegions(WindowInfo *pWindow);
 
 #elif defined(DARWIN)

trunk/src/VBox/GuestHost/OpenGL/packer/pack_visibleregion.c

@@ -30 +30 @@
 {
     GLint i, size, cnt;
-#ifdef WINDOWS
-    RECT *pRECT = (RECT*) pRects;
-#else
-#endif
 
     GET_PACKER_CONTEXT(pc);
@@ -48 +44 @@
     for (i=0; i<cRects; ++i)
     {
-#ifdef WINDOWS
-        WRITE_DATA(cnt, GLint, (GLint) pRECT[i].left);
-        WRITE_DATA(cnt+4, GLint, (GLint) pRECT[i].top);
-        WRITE_DATA(cnt+8, GLint, (GLint) pRECT[i].right);
-        WRITE_DATA(cnt+12, GLint, (GLint) pRECT[i].bottom);
+        WRITE_DATA(cnt, GLint, (GLint) pRects[4*i+0]);
+        WRITE_DATA(cnt+4, GLint, (GLint) pRects[4*i+1]);
+        WRITE_DATA(cnt+8, GLint, (GLint) pRects[4*i+2]);
+        WRITE_DATA(cnt+12, GLint, (GLint) pRects[4*i+3]);
         cnt += 16;
-#else
-#endif
     }
     WRITE_OPCODE( pc, CR_EXTEND_OPCODE );