Changeset 44802 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker

Timestamp:

Feb 22, 2013 2:34:46 PM (12 years ago)

Author:

vboxsync

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

83921

Message:

crOpenGL: saved state: save depth and stencil buffer data (still needs more testing)

Location:

trunk/src/VBox/GuestHost/OpenGL/state_tracker

Files:

• state_diff.c (modified) (8 diffs)
• state_snapshot.c (modified) (1 diff)

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

@@ -123 +123 @@
 }
 
-void crStateFreeFBImage(CRContext *to)
+void crStateFreeFBImageLegacy(CRContext *to)
 {
     if (to->buffer.pFrontImg)
@@ -140 +140 @@
 }
 
-int crStateAcquireFBImage(CRContext *to)
+int crStateAcquireFBImage(CRContext *to, CRFBData *data)
 {
     CRBufferState *pBuf = &to->buffer;
     CRPixelPackState packing = to->client.pack;
-    GLint cbData;
-    void *pFbData, *pBbData;
-
-    crStateFreeFBImage(to);
-
-    if (!to->buffer.width || !to->buffer.height)
-        return VINF_SUCCESS;
-
-    cbData = crPixelSize(GL_RGBA, GL_UNSIGNED_BYTE) * pBuf->width * pBuf->height;
-    pFbData = crAlloc(cbData);
-    if (!pFbData)
-        return VERR_NO_MEMORY;
-    pBbData = crAlloc(cbData);
-    if (!pBbData)
-    {
-        crFree(pFbData);
-        return VERR_NO_MEMORY;
-    }
+    uint32_t i;
 
     diff_api.PixelStorei(GL_PACK_SKIP_ROWS, 0);
@@ -172 +155 @@
     diff_api.PixelStorei(GL_PACK_LSB_FIRST, 0);
 
+    if (to->bufferobject.packBuffer->hwid>0)
+    {
+        diff_api.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
+    }
+
+    for (i = 0; i < data->cElements; ++i)
+    {
+        CRFBDataElement *el = &data->aElements[i];
+
+        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, el->idFBO);
+
+        if (el->enmBuffer)
+            diff_api.ReadBuffer(el->enmBuffer);
+
+        diff_api.ReadPixels(el->posX, el->posY, el->width, el->height, el->enmFormat, el->enmType, el->pvData);
+        crDebug("Acquired %d;%d;%d;%d;%d;0x%p fb image", el->enmBuffer, el->width, el->height, el->enmFormat, el->enmType, el->pvData);
+    }
+
+    if (to->bufferobject.packBuffer->hwid>0)
+    {
+        diff_api.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, to->bufferobject.packBuffer->hwid);
+    }
     if (to->framebufferobject.readFB)
     {
+        CRASSERT(to->framebufferobject.readFB->hwid);
+        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, to->framebufferobject.readFB->hwid);
+        diff_api.ReadBuffer(to->framebufferobject.readFB->readbuffer);
+
+    }
+    else if (data->idFBO)
+    {
+        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, data->idFBO);
+        diff_api.ReadBuffer(GL_COLOR_ATTACHMENT0);
+    }
+    else
+    {
         diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, 0);
-    }
-    if (to->bufferobject.packBuffer->hwid>0)
-    {
-        diff_api.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
-    }
-
-    pBuf->storedWidth = pBuf->width;
-    pBuf->storedHeight = pBuf->height;
-    diff_api.ReadBuffer(GL_FRONT);
-    diff_api.ReadPixels(0, 0, pBuf->width, pBuf->height, GL_RGBA, GL_UNSIGNED_BYTE, pFbData);
-    to->buffer.pFrontImg = pFbData;
-
-    diff_api.ReadBuffer(GL_BACK);
-    diff_api.ReadPixels(0, 0, pBuf->width, pBuf->height, GL_RGBA, GL_UNSIGNED_BYTE, pBbData);
-    to->buffer.pBackImg = pBbData;
-
-    if (to->bufferobject.packBuffer->hwid>0)
-    {
-        diff_api.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, to->bufferobject.packBuffer->hwid);
-    }
-    if (to->framebufferobject.readFB)
-    {
-        diff_api.BindFramebufferEXT(GL_READ_FRAMEBUFFER, to->framebufferobject.readFB->hwid);
-    }
-    diff_api.ReadBuffer(to->framebufferobject.readFB ?
-                        to->framebufferobject.readFB->readbuffer : to->buffer.readBuffer);
+        diff_api.ReadBuffer(to->buffer.readBuffer);
+    }
 
     diff_api.PixelStorei(GL_PACK_SKIP_ROWS, packing.skipRows);
@@ -213 +206 @@
 }
 
-void crStateApplyFBImage(CRContext *to)
-{
-    if (to->buffer.pFrontImg || to->buffer.pBackImg)
+void crStateApplyFBImage(CRContext *to, CRFBData *data)
+{
     {
         CRBufferState *pBuf = &to->buffer;
         CRPixelPackState unpack = to->client.unpack;
+        uint32_t i;
 
         diff_api.PixelStorei(GL_UNPACK_SKIP_ROWS, 0);
@@ -229 +222 @@
         diff_api.PixelStorei(GL_UNPACK_LSB_FIRST, 0);
 
-        if (to->framebufferobject.drawFB)
-        {
-            diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
-        }
-
         if (to->bufferobject.unpackBuffer->hwid>0)
         {
@@ -244 +232 @@
         diff_api.Disable(GL_COLOR_LOGIC_OP);
 
-        if (pBuf->pFrontImg)
-        {
-            diff_api.DrawBuffer(GL_FRONT);
-            diff_api.WindowPos2iARB(0, 0);
-            diff_api.DrawPixels(pBuf->storedWidth, pBuf->storedHeight, GL_RGBA, GL_UNSIGNED_BYTE, pBuf->pFrontImg);
-            crDebug("Applied %ix%i fb image", pBuf->storedWidth, pBuf->storedHeight);
-            crFree(pBuf->pFrontImg);
-            pBuf->pFrontImg = NULL;
-        }
-
-        if (pBuf->pBackImg)
-        {
-            diff_api.DrawBuffer(GL_BACK);
-            diff_api.WindowPos2iARB(0, 0);
-            diff_api.DrawPixels(pBuf->storedWidth, pBuf->storedHeight, GL_RGBA, GL_UNSIGNED_BYTE, pBuf->pBackImg);
-            crDebug("Applied %ix%i bb image", pBuf->storedWidth, pBuf->storedHeight);
-            crFree(pBuf->pBackImg);
-            pBuf->pBackImg = NULL;
+        for (i = 0; i < data->cElements; ++i)
+        {
+            CRFBDataElement *el = &data->aElements[i];
+
+            switch (el->enmFormat)
+            {
+                case GL_DEPTH_COMPONENT:
+                    diff_api.Enable(GL_DEPTH_TEST);
+                    break;
+                case GL_STENCIL_INDEX:
+                    diff_api.Enable(GL_STENCIL_TEST);
+                    break;
+                default:
+                    break;
+            }
+
+            diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, el->idFBO);
+
+            if (el->enmBuffer)
+                diff_api.DrawBuffer(el->enmBuffer);
+
+            diff_api.WindowPos2iARB(el->posX, el->posY);
+            diff_api.DrawPixels(el->width, el->height, el->enmFormat, el->enmType, el->pvData);
+            crDebug("Applied %d;%d;%d;%d;%d;0x%p fb image", el->enmBuffer, el->width, el->height, el->enmFormat, el->enmType, el->pvData);
+
+            switch (el->enmFormat)
+            {
+                case GL_DEPTH_COMPONENT:
+                    if (!to->buffer.depthTest)
+                    {
+                        diff_api.Disable(GL_DEPTH_TEST);
+                    }
+                    break;
+                case GL_STENCIL_INDEX:
+                    if (!to->stencil.stencilTest)
+                    {
+                        diff_api.Disable(GL_STENCIL_TEST);
+                    }
+                    break;
+                default:
+                    break;
+            }
+
         }
 
@@ -271 +284 @@
         if (to->framebufferobject.drawFB)
         {
+            CRASSERT(to->framebufferobject.drawFB->hwid);
             diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, to->framebufferobject.drawFB->hwid);
-        }
-        diff_api.DrawBuffer(to->framebufferobject.drawFB ? 
-                            to->framebufferobject.drawFB->drawbuffer[0] : to->buffer.drawBuffer);
+            diff_api.DrawBuffer(to->framebufferobject.drawFB->drawbuffer[0]);
+        }
+        else if (data->idFBO)
+        {
+            diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, data->idFBO);
+            diff_api.DrawBuffer(GL_COLOR_ATTACHMENT0);
+        }
+        else
+        {
+            diff_api.BindFramebufferEXT(GL_DRAW_FRAMEBUFFER, 0);
+            diff_api.DrawBuffer(to->buffer.drawBuffer);
+        }
         if (to->buffer.alphaTest)
         {
@@ -433 +456 @@
 
 #ifdef WINDOWS
-    crStateApplyFBImage(to);
+        if (to->buffer.pFrontImg)
+        {
+            CRFBData *pLazyData = (CRFBData *)to->buffer.pFrontImg;
+            crStateApplyFBImage(to, pLazyData);
+            crStateFreeFBImageLegacy(to);
+        }
 #endif
 }

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

@@ -1398 +1398 @@
     CRASSERT(pContext && pSSM);
 
-    pContext->buffer.storedWidth = pContext->buffer.width;
-    pContext->buffer.storedHeight = pContext->buffer.height;
+    /* this stuff is not used anymore, zero it up for sanity */
+    pContext->buffer.storedWidth = 0;
+    pContext->buffer.storedHeight = 0;
 
     CRASSERT(VBoxTlsRefIsFunctional(pContext));