Changeset 35995 in vbox for trunk/src/VBox

Timestamp:

Feb 16, 2011 1:44:55 PM (14 years ago)

Author:

vboxsync

Message:

crOpenGL: fix 3d window clipping for fbo case

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_muralfbo.c (modified) (2 diffs)

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)
             {
@@ -354 +355 @@
                 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
+#endif
+            for (j=0; j<mural->cVisibleRects; ++j)
             {
-                for (j=0; j<mural->cVisibleRects; ++j)
+                if (crServerIntersectRect(&rectwr, (CRrecti*) &mural->pVisibleRects[4*j], &sectr))
                 {
-                    if (crServerIntersectRect(&rectwr, (CRrecti*) &mural->pVisibleRects[4*j], &sectr))
+                    tmppixels = crAlloc(4*(sectr.x2-sectr.x1)*(sectr.y2-sectr.y1));
+                    if (!tmppixels)
                     {
-                        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);
+                        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);
                 }
             }