Changeset 44746 in vbox

Timestamp:

Feb 19, 2013 11:05:23 AM (12 years ago)

Author:

vboxsync

Message:

crOpenGL: saved state fixes

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_server.h (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (7 diffs)
• HostServices/SharedOpenGL/crserverlib/server_presenter.cpp (modified) (2 diffs)

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

@@ -247 +247 @@
 void CrHlpFreeTexImage(CRContext *pCurCtx, GLuint idPBO, void *pvData);
 void* CrHlpGetTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLuint idPBO);
+void CrHlpPutTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, void *pvData);
 
 /* */

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

@@ -154 +154 @@
      * and generally this should be zeroed up */
     cr_server.currentCtxInfo = NULL;
-    cr_server.currentWindow = NULL;
+    cr_server.currentWindow = 0;
     cr_server.currentNativeWindow = 0;
     cr_server.currentMural = NULL;
@@ -992 +992 @@
         CRASSERT(cMurals + Data.cAdditionalMurals + crHashtableNumElements(pGlobal->additionalMuralContextTable) == crHashtableNumElements(cr_server.muralTable) - 1);
     }
+
+    crFreeHashtable(Data.usedMuralTable, NULL);
 }
 
@@ -1038 +1040 @@
         GLuint idPBO = cr_server.bUsePBOForReadback ? pMural->idPBO : 0;
 
+        CRASSERT(!pContext->buffer.width);
+        CRASSERT(!pContext->buffer.height);
+
         if (idPBO)
         {
@@ -1137 +1142 @@
     CRASSERT(pContext && pSSM);
     CRASSERT(pMural);
+    CRASSERT(pMural->CreateInfo.externalID);
 
     /* We could have skipped saving the key and use similar callback to load context states back,
@@ -1155 +1161 @@
 
 #ifdef CR_STATE_NO_TEXTURE_IMAGE_STORE
-    if (pContextInfo->currentMural || crHashtableSearch(cr_server.muralTable, key))
+    if (pContextInfo->currentMural
+            || crHashtableSearch(cr_server.muralTable, pMural->CreateInfo.externalID) /* <- this is not a dummy mural */
+            )
     {
         CRASSERT(pMural->CreateInfo.externalID);
+        CRASSERT(!crHashtableSearch(cr_server.dummyMuralTable, pMural->CreateInfo.externalID));
         pData->rc = SSMR3PutMem(pSSM, &pMural->CreateInfo.externalID, sizeof(pMural->CreateInfo.externalID));
     }
     else
     {
+        /* this is a dummy mural */
         CRASSERT(!pMural->width);
         CRASSERT(!pMural->height);
-        CRASSERT(crHashtableSearch(cr_server.dummyMuralTable, key));
+        CRASSERT(crHashtableSearch(cr_server.dummyMuralTable, pMural->CreateInfo.externalID));
         pData->rc = SSMR3PutMem(pSSM, &i32Dummy, sizeof(pMural->CreateInfo.externalID));
     }
@@ -1578 +1588 @@
         storedWidth = pMural->width;
         storedHeight = pMural->height;
-        CRASSERT(pContext->buffer.storedWidth == storedWidth);
-        CRASSERT(pContext->buffer.storedHeight == storedHeight);
     }
     else
@@ -1625 +1633 @@
         {
             /* can apply the data right away */
-            crStateApplyFBImage(pContext);
+            if (!pMural->fUseFBO)
+            {
+                CRASSERT(cr_server.bForceOffscreenRendering == CR_SERVER_REDIR_NONE);
+                crStateApplyFBImage(pContext);
+            }
+            else
+            {
+                VBOXVR_TEXTURE Tex;
+                Tex.width = pMural->width;
+                Tex.height = pMural->height;
+                Tex.target = GL_TEXTURE_2D;
+
+                CRASSERT(cr_server.bForceOffscreenRendering > CR_SERVER_REDIR_NONE);
+
+                if (pBuf->pFrontImg)
+                {
+                    Tex.hwid = pMural->aidColorTexs[CR_SERVER_FBO_FB_IDX(pMural)];
+                    CRASSERT(Tex.hwid);
+                    CrHlpPutTexImage(pContext, &Tex, pBuf->pFrontImg);
+                }
+
+                if (pBuf->pBackImg)
+                {
+                    Tex.hwid = pMural->aidColorTexs[CR_SERVER_FBO_BB_IDX(pMural)];
+                    CRASSERT(Tex.hwid);
+                    CrHlpPutTexImage(pContext, &Tex, pBuf->pBackImg);
+                }
+
+                crStateFreeFBImage(pContext);
+            }
             CRASSERT(!pBuf->pFrontImg);
             CRASSERT(!pBuf->pBackImg);

trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_presenter.cpp

@@ -286 +286 @@
 }
 
-void* CrHlpGetTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLuint idPBO)
-{
-    void *pvData = NULL;
+void CrHlpPutTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, void *pvData)
+{
+    CRASSERT(pTexture->hwid);
     cr_server.head_spu->dispatch_table.BindTexture(pTexture->target, pTexture->hwid);
 
-    if (idPBO)
-    {
-        cr_server.head_spu->dispatch_table.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, idPBO);
-    }
-    else
-    {
-        if (!pCurCtx || crStateIsBufferBoundForCtx(pCurCtx, GL_PIXEL_PACK_BUFFER_ARB))
-        {
-            cr_server.head_spu->dispatch_table.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
-        }
-
-        pvData = crAlloc(4*pTexture->width*pTexture->height);
-        if (!pvData)
-        {
-            crWarning("Out of memory in CrHlpGetTexImage");
-            return NULL;
-        }
+    if (!pCurCtx || crStateIsBufferBoundForCtx(pCurCtx, GL_PIXEL_UNPACK_BUFFER_ARB))
+    {
+        cr_server.head_spu->dispatch_table.BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, 0);
     }
 
     /*read the texture, note pixels are NULL for PBO case as it's offset in the buffer*/
-    cr_server.head_spu->dispatch_table.GetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_BYTE, pvData);
+    cr_server.head_spu->dispatch_table.TexSubImage2D(GL_TEXTURE_2D,  0 /* level*/,  0 /*xoffset*/,  0 /*yoffset*/,  pTexture->width, pTexture->height, GL_BGRA, GL_UNSIGNED_BYTE, pvData);
 
     /*restore gl state*/
@@ -328 +314 @@
     }
 
+    if (pCurCtx && crStateIsBufferBoundForCtx(pCurCtx, GL_PIXEL_UNPACK_BUFFER_ARB))
+        cr_server.head_spu->dispatch_table.BindBufferARB(GL_PIXEL_UNPACK_BUFFER_ARB, pCurCtx->bufferobject.unpackBuffer->hwid);
+}
+
+void* CrHlpGetTexImage(CRContext *pCurCtx, PVBOXVR_TEXTURE pTexture, GLuint idPBO)
+{
+    void *pvData = NULL;
+    cr_server.head_spu->dispatch_table.BindTexture(pTexture->target, pTexture->hwid);
+
+    if (idPBO)
+    {
+        cr_server.head_spu->dispatch_table.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, idPBO);
+    }
+    else
+    {
+        if (!pCurCtx || crStateIsBufferBoundForCtx(pCurCtx, GL_PIXEL_PACK_BUFFER_ARB))
+        {
+            cr_server.head_spu->dispatch_table.BindBufferARB(GL_PIXEL_PACK_BUFFER_ARB, 0);
+        }
+
+        pvData = crAlloc(4*pTexture->width*pTexture->height);
+        if (!pvData)
+        {
+            crWarning("Out of memory in CrHlpGetTexImage");
+            return NULL;
+        }
+    }
+
+    /*read the texture, note pixels are NULL for PBO case as it's offset in the buffer*/
+    cr_server.head_spu->dispatch_table.GetTexImage(GL_TEXTURE_2D, 0, GL_BGRA, GL_UNSIGNED_BYTE, pvData);
+
+    /*restore gl state*/
+    if (pCurCtx)
+    {
+        CRTextureObj *pTObj;
+        CRTextureLevel *pTImg;
+        crStateGetTextureObjectAndImage(pCurCtx, pTexture->target, 0, &pTObj, &pTImg);
+
+        GLuint uid = pTObj->hwid;
+        cr_server.head_spu->dispatch_table.BindTexture(pTexture->target, uid);
+    }
+    else
+    {
+        cr_server.head_spu->dispatch_table.BindTexture(pTexture->target, 0);
+    }
+
     if (idPBO)
     {