Changeset 55764 in vbox for trunk/src

Timestamp:

May 8, 2015 7:04:15 PM (10 years ago)

Author:

vboxsync

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

100190

Message:

3D: saving state: fix broken in r100180 SSM versioning.

File:

• trunk/src/VBox/HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (5 diffs)

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

@@ -1251 +1251 @@
 }
 
+/* Add framebuffer image elements arrording to SSM version. Please refer to cr_version.h
+ * in order to distinguish between versions. */
 static int crVBoxServerFBImageDataInitEx(CRFBData *pData, CRContextInfo *pCtxInfo, CRMuralInfo *pMural, GLboolean fWrite, uint32_t version, GLuint overrideWidth, GLuint overrideHeight)
 {
@@ -1288 +1290 @@
         }
     }
+
     pData->cElements = 0;
 
-    rc = crVBoxAddFBDataElement(
-            pData,
-            pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
-            pData->aElements[1].idFBO ? GL_COLOR_ATTACHMENT0 : GL_FRONT,
-            width, height, GL_RGBA, GL_UNSIGNED_BYTE);
+    rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
+        pData->aElements[1].idFBO ? GL_COLOR_ATTACHMENT0 : GL_FRONT, width, height, GL_RGBA, GL_UNSIGNED_BYTE);
     AssertReturn(rc == VINF_SUCCESS, rc);
 
@@ -1305 +1305 @@
                                                                       *    no matter what the visual bits are. */
     {
-        rc = crVBoxAddFBDataElement(
-                pData,
-                pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_BB_IDX(pMural)] : 0,
-                pData->aElements[1].idFBO ? GL_COLOR_ATTACHMENT0 : GL_BACK,
-                width, height, GL_RGBA, GL_UNSIGNED_BYTE);
+        rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_BB_IDX(pMural)] : 0,
+            pData->aElements[1].idFBO ? GL_COLOR_ATTACHMENT0 : GL_BACK, width, height, GL_RGBA, GL_UNSIGNED_BYTE);
         AssertReturn(rc == VINF_SUCCESS, rc);
     }
@@ -1316 +1313 @@
         return VINF_SUCCESS;
 
-    if (pCtxInfo->CreateInfo.requestedVisualBits & CR_DEPTH_BIT)
-    {
-        rc = crVBoxAddFBDataElement(
-                pData,
-                pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
-                pMural ? pMural->idDepthRB : 0,
-                width, height, GL_DEPTH_COMPONENT, GL_FLOAT);
+    if (version < SHCROGL_SSM_VERSION_WITH_SINGLE_DEPTH_STENCIL)
+    {
+        rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
+            pMural ? pMural->idDepthRB : 0, width, height, GL_DEPTH_COMPONENT, GL_FLOAT);
         AssertReturn(rc == VINF_SUCCESS, rc);
 
@@ -1329 +1323 @@
         for (i = 0; i < width * height; ++i)
             pF[i] = 1.;
+
+        rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
+            pMural ? pMural->idDepthRB : 0, width, height, GL_STENCIL_INDEX, GL_UNSIGNED_INT);
+        AssertReturn(rc == VINF_SUCCESS, rc);
+
+        return VINF_SUCCESS;
+    }
+
+    if (version < SHCROGL_SSM_VERSION_WITH_SEPARATE_DEPTH_STENCIL_BUFFERS)
+    {
+        /* Use GL_DEPTH_STENCIL only in case if both CR_STENCIL_BIT and CR_DEPTH_BIT specified. */
+        if (   (pCtxInfo->CreateInfo.requestedVisualBits & CR_STENCIL_BIT)
+            && (pCtxInfo->CreateInfo.requestedVisualBits & CR_DEPTH_BIT))
+        {
+            rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0, 0,
+                width, height, GL_DEPTH_STENCIL, GL_UNSIGNED_INT_24_8);
+            AssertReturn(rc == VINF_SUCCESS, rc);
+        }
+
+        return VINF_SUCCESS;
+    }
+
+    /* Current SSM verion (SHCROGL_SSM_VERSION_WITH_SEPARATE_DEPTH_STENCIL_BUFFERS). */
+
+    if (pCtxInfo->CreateInfo.requestedVisualBits & CR_DEPTH_BIT)
+    {
+        rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
+            pMural ? pMural->idDepthRB : 0, width, height, GL_DEPTH_COMPONENT, GL_FLOAT);
+        AssertReturn(rc == VINF_SUCCESS, rc);
+
+        /* Init to default depth value, just in case. */
+        pF = (GLfloat*)pEl->pvData;
+        for (i = 0; i < width * height; ++i)
+            pF[i] = 1.;
     }
 
     if (pCtxInfo->CreateInfo.requestedVisualBits & CR_STENCIL_BIT)
     {
-        rc = crVBoxAddFBDataElement(
-                pData,
-                pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
-                pMural ? pMural->idDepthRB : 0,
-                width, height, GL_STENCIL_INDEX, GL_UNSIGNED_INT);
+        rc = crVBoxAddFBDataElement(pData, pMural && pMural->fRedirected ? pMural->aidFBOs[CR_SERVER_FBO_FB_IDX(pMural)] : 0,
+            pMural ? pMural->idDepthRB : 0, width, height, GL_STENCIL_INDEX, GL_UNSIGNED_INT);
         AssertReturn(rc == VINF_SUCCESS, rc);
     }