Changeset 41128 in vbox for trunk/src/VBox/GuestHost/OpenGL/include

Timestamp:

May 3, 2012 8:19:54 AM (13 years ago)

Author:

vboxsync

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

77736

Message:

crOpenGL: backwards compatibility for 3D saved state v 28

Location:

trunk/src/VBox/GuestHost/OpenGL/include

Files:

• cr_glstate.h (modified) (1 diff)
• cr_server.h (modified) (1 diff)
• cr_version.h (modified) (1 diff)
• state/cr_attrib.h (modified) (3 diffs)

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

@@ -240 +240 @@
 typedef DECLCALLBACK(CRContext*) FNCRSTATE_CONTEXT_GET(void*);
 typedef FNCRSTATE_CONTEXT_GET *PFNCRSTATE_CONTEXT_GET;
-DECLEXPORT(int32_t) crStateLoadContext(CRContext *pContext, CRHashTable * pCtxTable, PFNCRSTATE_CONTEXT_GET pfnCtxGet, PSSMHANDLE pSSM);
+DECLEXPORT(int32_t) crStateLoadContext(CRContext *pContext, CRHashTable * pCtxTable, PFNCRSTATE_CONTEXT_GET pfnCtxGet, PSSMHANDLE pSSM, uint32_t u32Version);
 DECLEXPORT(void)    crStateFreeShared(CRContext *pContext, CRSharedState *s);
 DECLEXPORT(void) crStateFreeShared(CRContext *pContext, CRSharedState *s);

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

@@ -30 +30 @@
 extern "C" {
 #endif
-
-#define SHCROGL_SSM_VERSION 29
 
 #define CR_MAX_WINDOWS 100

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

@@ -8 +8 @@
 #define CR_VERSION_H
 
+#define SHCROGL_SSM_VERSION_BEFORE_CTXUSAGE_BITS 28
+#define SHCROGL_SSM_VERSION 29
 
 /* These define the Chromium release number.

trunk/src/VBox/GuestHost/OpenGL/include/state/cr_attrib.h

@@ -257 +257 @@
         GLboolean       enabled2D[CR_MAX_TEXTURE_UNITS];
         GLboolean       enabled3D[CR_MAX_TEXTURE_UNITS];
-#ifdef CR_ARB_texture_cube_map
+# ifdef CR_ARB_texture_cube_map
         GLboolean       enabledCubeMap[CR_MAX_TEXTURE_UNITS];
-#endif
+# endif
         CRTextureObj *current1D[CR_MAX_TEXTURE_UNITS];
         CRTextureObj *current2D[CR_MAX_TEXTURE_UNITS];
         CRTextureObj *current3D[CR_MAX_TEXTURE_UNITS];
-#ifdef CR_ARB_texture_cube_map
+# ifdef CR_ARB_texture_cube_map
         CRTextureObj *currentCubeMap[CR_MAX_TEXTURE_UNITS];
-#endif
+# endif
         GLcolorf borderColor[4];  /* 4 = 1D, 2D, 3D and cube map textures */
         GLenum minFilter[4];
@@ -271 +271 @@
         GLenum wrapS[4];
         GLenum wrapT[4];
-#ifdef CR_OPENGL_VERSION_1_2
+# ifdef CR_OPENGL_VERSION_1_2
         GLenum wrapR[4];
         GLfloat priority[4];
@@ -278 +278 @@
         GLint baseLevel[4];
         GLint maxLevel[4];
-#endif
+# endif
 
         GLuint          curTextureUnit;