Changeset 16718 in vbox

Timestamp:

Feb 12, 2009 7:01:48 PM (16 years ago)

Author:

vboxsync

Message:

crOpenGL: another 8x speed up for compiz, xdamage but without regions info yet

Location:

trunk/src/VBox/Additions/WINNT/Graphics/crOpenGL

Files:

• context.c (modified) (3 diffs)
• load.c (modified) (4 diffs)
• stub.c (modified) (3 diffs)
• stub.h (modified) (3 diffs)

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

@@ -139 +139 @@
     winInfo->drawable = (GLXDrawable) spuWin;
     winInfo->pVisibleRegions = NULL;
+    winInfo->cVisibleRegions = 0;
 #endif
     winInfo->spuWindow = spuWin;
@@ -277 +278 @@
 #ifdef GLX
     context->pGLXPixmapsHash = crAllocHashtable();
+    context->damageInitFailed = GL_FALSE;
+    context->damageDpy = NULL;
+    context->damageEventsBase = 0;
 #endif
 
@@ -1008 +1012 @@
 #ifdef GLX
     crFreeHashtable(context->pGLXPixmapsHash, crFree);
+    if (context->damageDpy)
+    {
+        XCloseDisplay(context->damageDpy);
+    }
 #endif
 

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

@@ -74 +74 @@
 static ClearFunc_t origClear;
 static ViewportFunc_t origViewport;
+static SwapBuffersFunc_t origSwapBuffers;
+static DrawBufferFunc_t origDrawBuffer;
 
 static void stubCheckWindowState(void)
@@ -152 +154 @@
 }
 
+static void SPU_APIENTRY trapSwapBuffers(GLint window, GLint flags)
+{
+    stubCheckWindowState();
+    origSwapBuffers(window, flags);
+}
+
+static void SPU_APIENTRY trapDrawBuffer(GLenum buf)
+{
+    stubCheckWindowState();
+    origDrawBuffer(buf);
+}
 
 /**
@@ -166 +179 @@
         origClear = stub.spuDispatch.Clear;
         origViewport = stub.spuDispatch.Viewport;
+        origSwapBuffers = stub.spuDispatch.SwapBuffers;
+        origDrawBuffer = stub.spuDispatch.DrawBuffer;
         stub.spuDispatch.Clear = trapClear;
         stub.spuDispatch.Viewport = trapViewport;
+        /*stub.spuDispatch.SwapBuffers = trapSwapBuffers;
+        stub.spuDispatch.DrawBuffer = trapDrawBuffer;*/
     }
 
@@ -297 +314 @@
 #elif defined(GLX)
     defaultWin->pVisibleRegions = NULL;
+    defaultWin->cVisibleRegions = 0;
 #endif
     crHashtableAdd(stub.windowTable, 0, defaultWin);

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

@@ -451 +451 @@
     XFixesDestroyRegion(pWindow->dpy, xreg);
 
-    if (!pWindow->pVisibleRegions 
+    /* @todo For some odd reason *first* run of compiz on freshly booted VM gives us 0 cRects all the time.
+     * In (!pWindow->pVisibleRegions && cRects) "&& cRects" is a workaround for that case, especially as this
+     * information is useless for full screen composing managers anyway.
+     */
+    if ((!pWindow->pVisibleRegions && cRects)
         || pWindow->cVisibleRegions!=cRects 
         || crMemcmp(pWindow->pVisibleRegions, pXRects, cRects * sizeof(XRectangle)))
@@ -465 +469 @@
         }
 
-        /*crDebug("Got %i rects.", cRects);*/
+        //crDebug("Got %i rects.", cRects);
         for (i=0; i<cRects; ++i)
         {
@@ -472 +476 @@
             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("Rect[%i]=(%i,%i,%i,%i)", i, pGLRects[4*i+0], pGLRects[4*i+1], pGLRects[4*i+2], pGLRects[4*i+3]);                   
         }
 

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

@@ -43 +43 @@
 #include <X11/extensions/XShm.h>
 #include <sys/shm.h>
+#include <X11/extensions/Xdamage.h>
 #endif
 
@@ -74 +75 @@
     Window root;
     GC gc;
-    Pixmap pixmap;
-    void *data;
+    Pixmap pixmap; /* Shared memory pixmap object, if it's supported*/
+    Damage damage;
+    Bool   bPixmapImageDirty;
 };
 #endif
@@ -111 +113 @@
     GLXContext glxContext;
     CRHashTable *pGLXPixmapsHash;
+    Bool     damageInitFailed;
+    Display *damageDpy; /* second display connection to read xdamage extension data */
+    int      damageEventsBase;
 #endif
 };