Changeset 35770 in vbox for trunk/src/VBox/HostServices/SharedOpenGL/crserverlib

Timestamp:

Jan 28, 2011 3:23:22 PM (14 years ago)

Author:

vboxsync

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

69735

Message:

crOpenGL: fix deadlock with multiply screens (#5462)

File:

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

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

@@ -337 +337 @@
         if (crServerIntersectScreen(mural, i, &rect))
         {
-            tmppixels = crAlloc(4*(rect.x2-rect.x1)*(rect.y2-rect.y1));
-            if (!tmppixels)
-            {
-                crWarning("Out of memory in crServerPresentFBO");
-                crFree(pixels);
-                return;
-            }
-
             /* rect in window relative coords */
             crServerTransformRect(&rectwr, &rect, -mural->gX, -mural->gY);
@@ -350 +342 @@
             if (!mural->pVisibleRects)
             {
+                tmppixels = crAlloc(4*(rect.x2-rect.x1)*(rect.y2-rect.y1));
+                if (!tmppixels)
+                {
+                    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);
             }
@@ -359 +360 @@
                     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,
@@ -367 +377 @@
                 }
             }
-
-            crFree(tmppixels);
         }
     }