Changeset 35998 in vbox for trunk/src/VBox

Timestamp:

Feb 16, 2011 2:24:09 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: fix guest compiz clipping with forced fbo

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_server.h (modified) (2 diffs)
• HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (2 diffs)
• HostServices/SharedOpenGL/crserverlib/server_window.c (modified) (2 diffs)

trunk/src/VBox/GuestHost/OpenGL/include/cr_server.h

@@ -26 +26 @@
 #endif
 
-#define SHCROGL_SSM_VERSION 24
+#define SHCROGL_SSM_VERSION 25
 
 #define CR_MAX_WINDOWS 100
@@ -64 +64 @@
     GLboolean bUseFBO;       /*redirect to FBO instead of real host window*/
 
-    GLint  cVisibleRects;    /*count of visible rects*/
-    GLint *pVisibleRects;    /*visible rects left, top, right, bottom*/
+    GLint       cVisibleRects;    /*count of visible rects*/
+    GLint      *pVisibleRects;    /*visible rects left, top, right, bottom*/
+    GLboolean   bReceivedRects;   /*indicates if guest did any updates for visible regions*/
 
     GLuint idFBO, idColorTex, idDepthStencilRB;

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c

@@ -340 +340 @@
             crServerTransformRect(&rectwr, &rect, -mural->gX, -mural->gY);
 
-#if 0 /*@todo recheck with compiz on guests, as we could sometimes have main compiz windows without visible rects*/
             if (!mural->pVisibleRects)
             {
-                tmppixels = crAlloc(4*(rect.x2-rect.x1)*(rect.y2-rect.y1));
-                if (!tmppixels)
+                /*we don't get any rects info for guest compiz windows, so we treat windows as visible unless explicitly received 0 visible rects*/
+                if (!mural->bReceivedRects)
                 {
-                    crWarning("Out of memory in crServerPresentFBO");
-                    crFree(pixels);
-                    return;
-                }
-
-                crServerCopySubImage(tmppixels, pixels, &rectwr, mural->fboWidth, mural->fboHeight);
-                /*Note: pfnPresentFBO would free tmppixels*/
-                cr_server.pfnPresentFBO(tmppixels, i, rect.x1-cr_server.screen[i].x, rect.y1-cr_server.screen[i].y, rect.x2-rect.x1, rect.y2-rect.y1);
-            }
-#endif
-            for (j=0; j<mural->cVisibleRects; ++j)
-            {
-                if (crServerIntersectRect(&rectwr, (CRrecti*) &mural->pVisibleRects[4*j], &sectr))
-                {
-                    tmppixels = crAlloc(4*(sectr.x2-sectr.x1)*(sectr.y2-sectr.y1));
+                    tmppixels = crAlloc(4*(rect.x2-rect.x1)*(rect.y2-rect.y1));
                     if (!tmppixels)
                     {
@@ -368 +353 @@
                     }
 
-                    crServerCopySubImage(tmppixels, pixels, &sectr, mural->fboWidth, mural->fboHeight);
+                    crServerCopySubImage(tmppixels, pixels, &rectwr, mural->fboWidth, mural->fboHeight);
                     /*Note: pfnPresentFBO would free tmppixels*/
-                    cr_server.pfnPresentFBO(tmppixels, i,
-                                            sectr.x1+mural->gX-cr_server.screen[i].x,
-                                            sectr.y1+mural->gY-cr_server.screen[i].y,
-                                            sectr.x2-sectr.x1, sectr.y2-sectr.y1);
+                    cr_server.pfnPresentFBO(tmppixels, i, rect.x1-cr_server.screen[i].x, rect.y1-cr_server.screen[i].y, rect.x2-rect.x1, rect.y2-rect.y1);
+                }
+            }
+            else
+            {
+                for (j=0; j<mural->cVisibleRects; ++j)
+                {
+                    if (crServerIntersectRect(&rectwr, (CRrecti*) &mural->pVisibleRects[4*j], &sectr))
+                    {
+                        tmppixels = crAlloc(4*(sectr.x2-sectr.x1)*(sectr.y2-sectr.y1));
+                        if (!tmppixels)
+                        {
+                            crWarning("Out of memory in crServerPresentFBO");
+                            crFree(pixels);
+                            return;
+                        }
+
+                        crServerCopySubImage(tmppixels, pixels, &sectr, mural->fboWidth, mural->fboHeight);
+                        /*Note: pfnPresentFBO would free tmppixels*/
+                        cr_server.pfnPresentFBO(tmppixels, i,
+                                                sectr.x1+mural->gX-cr_server.screen[i].x,
+                                                sectr.y1+mural->gY-cr_server.screen[i].y,
+                                                sectr.x2-sectr.x1, sectr.y2-sectr.y1);
+                    }
                 }
             }

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_window.c

@@ -86 +86 @@
         mural->cVisibleRects = 0;
         mural->pVisibleRects = NULL;
+        mural->bReceivedRects = GL_FALSE;
 
         /* generate ID for this new window/mural (special-case for file conns) */
@@ -282 +283 @@
 
     mural->cVisibleRects = cRects;
+    mural->bReceivedRects = GL_TRUE;
     if (cRects)
     {