Changeset 30486 in vbox for trunk

Timestamp:

Jun 28, 2010 11:45:42 PM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: tracking fixes

Location:

trunk/src/VBox/Additions/common/crOpenGL

Files:

• load.c (modified) (1 diff)
• pack/packspu_misc.c (modified) (1 diff)
• stub.c (modified) (3 diffs)

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

@@ -277 +277 @@
         origDrawBuffer = stub.spuDispatch.DrawBuffer;
         origScissor = stub.spuDispatch.Scissor;
-#ifndef CR_NEWWINTRACK
         stub.spuDispatch.Clear = trapClear;
         stub.spuDispatch.Viewport = trapViewport;
-#endif
+
         if (stub.viewportHack)
             stub.spuDispatch.Scissor = trapScissor;

trunk/src/VBox/Additions/common/crOpenGL/pack/packspu_misc.c

@@ -128 +128 @@
         {
             if ((thread != &pack_spu.thread[i]) && pack_spu.thread[i].netServer.conn
-                && (pack_spu.thread[i].netServer.conn->u32ClientID == thread->netServer.conn->u32InjectClientID))
+                && (pack_spu.thread[i].netServer.conn->u32ClientID == thread->netServer.conn->u32InjectClientID)
+                && pack_spu.thread[i].packer && pack_spu.thread[i].packer->currentBuffer)
             {
                 packspuFlush((void *) &pack_spu.thread[i]);

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

@@ -446 +446 @@
 {
     int evb, erb, vmi=0, vma=0;
-
-    XLOCK(pWindow->dpy);
-    if (XCompositeQueryExtension(pWindow->dpy, &evb, &erb) 
-        && XCompositeQueryVersion(pWindow->dpy, &vma, &vmi) 
+    Display *dpy = stubGetWindowDisplay(pWindow);
+
+    XLOCK(dpy);
+    if (XCompositeQueryExtension(dpy, &evb, &erb) 
+        && XCompositeQueryVersion(dpy, &vma, &vmi) 
         && (vma>0 || vmi>=4))
     {
@@ -455 +456 @@
         vma=0;
         vmi=0;
-        if (XFixesQueryExtension(pWindow->dpy, &evb, &erb) 
-            && XFixesQueryVersion(pWindow->dpy, &vma, &vmi)
+        if (XFixesQueryExtension(dpy, &evb, &erb) 
+            && XFixesQueryVersion(dpy, &vma, &vmi)
             && vma>=2)
         {
             crDebug("XFixes %i.%i", vma, vmi);
-            XUNLOCK(pWindow->dpy);
+            XUNLOCK(dpy);
             return GL_TRUE;
         }
@@ -472 +473 @@
         crWarning("XComposite not found or old version (%i.%i), no VisibilityTracking", vma, vmi);
     }
-    XUNLOCK(pWindow->dpy);
+    XUNLOCK(dpy);
     return GL_FALSE;
 }