Changeset 55798 in vbox

Timestamp:

May 11, 2015 10:42:40 AM (10 years ago)

Author:

vboxsync

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

100235

Message:

3D: restoring state: ignore invalid DEPTH/STENCIL data when restoring state if SSM version < SHCROGL_SSM_VERSION_WITH_SEPARATE_DEPTH_STENCIL_BUFFERS.

Location:

trunk/src/VBox

Files:

• GuestHost/OpenGL/include/cr_glstate.h (modified) (1 diff)
• GuestHost/OpenGL/state_tracker/state_diff.c (modified) (1 diff)
• HostServices/SharedOpenGL/crserverlib/server_main.c (modified) (1 diff)

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

@@ -271 +271 @@
     /* override default draw and read buffers to be used for offscreen rendering */
     GLint idOverrrideFBO;
+    uint32_t u32Version;
     uint32_t cElements;
     CRFBDataElement aElements[1];

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

@@ -314 +314 @@
 #endif
 
+            /* Before SSM version SHCROGL_SSM_VERSION_WITH_SEPARATE_DEPTH_STENCIL_BUFFERS
+             * saved state file contined invalid DEPTH/STENCIL data. In order to prevent
+             * crashes and improper guest App behavior, this data should be ignored. */
+            if (   data->u32Version < SHCROGL_SSM_VERSION_WITH_SEPARATE_DEPTH_STENCIL_BUFFERS
+                && (   el->enmFormat == GL_DEPTH_COMPONENT
+                    || el->enmFormat == GL_STENCIL_INDEX
+                    || el->enmFormat == GL_DEPTH_STENCIL))
+                continue;
+
             if (el->enmFormat == GL_DEPTH_COMPONENT || el->enmFormat == GL_DEPTH_STENCIL)
             {

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

@@ -1289 +1289 @@
         }
     }
+
+    pData->u32Version = version;
 
     pData->cElements = 0;