Changeset 25155 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

Timestamp:

Dec 3, 2009 12:23:36 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: better fix for blank screen after compiz loading

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (4 diffs)

trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

@@ -1125 +1125 @@
         diff_api.PixelStorei(GL_PACK_LSB_FIRST, 0);
 
+        diff_api.ReadBuffer(GL_FRONT);
         diff_api.ReadPixels(0, 0, pVP->viewportW, pVP->viewportH, GL_RGBA, GL_UNSIGNED_BYTE, pData);
 
+        diff_api.ReadBuffer(pContext->framebufferobject.readFB ? 
+                            pContext->framebufferobject.readFB->readbuffer : pContext->buffer.readBuffer);
         diff_api.PixelStorei(GL_PACK_SKIP_ROWS, packing.skipRows);
         diff_api.PixelStorei(GL_PACK_SKIP_PIXELS, packing.skipPixels);
@@ -1786 +1789 @@
     {
         CRViewportState *pVP = &pContext->viewport;
-        CRPixelPackState unpack = pContext->client.unpack;
         GLint cbData = crPixelSize(GL_RGBA, GL_UNSIGNED_BYTE) * pVP->viewportH * pVP->viewportW;
         void *pData = crAlloc(cbData);
@@ -1792 +1794 @@
         if (!pData)
         {
+            pContext->pImage = NULL;
             return VERR_NO_MEMORY;
         }
@@ -1798 +1801 @@
         AssertRCReturn(rc, rc);
 
-        diff_api.PixelStorei(GL_UNPACK_SKIP_ROWS, 0);
-        diff_api.PixelStorei(GL_UNPACK_SKIP_PIXELS, 0);
-        diff_api.PixelStorei(GL_UNPACK_ALIGNMENT, 1);
-        diff_api.PixelStorei(GL_UNPACK_ROW_LENGTH, 0);
-        diff_api.PixelStorei(GL_UNPACK_IMAGE_HEIGHT, 0);
-        diff_api.PixelStorei(GL_UNPACK_SKIP_IMAGES, 0);
-        diff_api.PixelStorei(GL_UNPACK_SWAP_BYTES, 0);
-        diff_api.PixelStorei(GL_UNPACK_LSB_FIRST, 0);
-
-        diff_api.WindowPos2iARB(0, 0);
-        diff_api.DrawPixels(pVP->viewportW, pVP->viewportH, GL_RGBA, GL_UNSIGNED_BYTE, pData);
-
-        diff_api.PixelStorei(GL_UNPACK_SKIP_ROWS, unpack.skipRows);
-        diff_api.PixelStorei(GL_UNPACK_SKIP_PIXELS, unpack.skipPixels);
-        diff_api.PixelStorei(GL_UNPACK_ALIGNMENT, unpack.alignment);
-        diff_api.PixelStorei(GL_UNPACK_ROW_LENGTH, unpack.rowLength);
-        diff_api.PixelStorei(GL_UNPACK_IMAGE_HEIGHT, unpack.imageHeight);
-        diff_api.PixelStorei(GL_UNPACK_SKIP_IMAGES, unpack.skipImages);
-        diff_api.PixelStorei(GL_UNPACK_SWAP_BYTES, unpack.swapBytes);
-        diff_api.PixelStorei(GL_UNPACK_LSB_FIRST, unpack.psLSBFirst);
-
-        crFree(pData);
+        pContext->pImage = pData;
     }