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

Timestamp:

Aug 28, 2012 3:35:26 PM (13 years ago)

Author:

vboxsync

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

80386

Message:

crOpenGL: program/shader objects fixes for proper saved state handling

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_glsl.c (modified) (7 diffs)

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

@@ -200 +200 @@
 {
     CRGLSLShader *pShader = crStateGetShaderObj(id);
+#ifdef IN_GUEST
+    CRASSERT(!pShader || pShader->hwid == id);
+#endif
     return pShader ? pShader->hwid : 0;
 }
@@ -206 +209 @@
 {
     CRGLSLProgram *pProgram = crStateGetProgramObj(id);
+#ifdef IN_GUEST
     CRASSERT(!pProgram || pProgram->hwid == id);
+#endif
     return pProgram ? pProgram->hwid : 0;
 }
@@ -254 +259 @@
 }
 
-DECLEXPORT(void) STATE_APIENTRY crStateCreateShader(GLuint id, GLenum type)
+DECLEXPORT(GLuint) STATE_APIENTRY crStateCreateShader(GLuint hwid, GLenum type)
 {
     CRGLSLShader *pShader;
     CRContext *g = GetCurrentContext();
-
-    CRASSERT(!crStateGetShaderObj(id));
+    GLuint stateId = hwid;
+
+#ifdef IN_GUEST
+    CRASSERT(!crStateGetShaderObj(stateId));
+#else
+    /* the id may not necesserily be hwid after save state restoration */
+    while ((pShader = crStateGetShaderObj(stateId)) != NULL)
+    {
+        GLuint newStateId = stateId + 7;
+        crDebug("Shader object %d already exists, generating a new one, %d", stateId, newStateId);
+        stateId = newStateId;
+    }
+#endif
 
     pShader = (CRGLSLShader *) crAlloc(sizeof(*pShader));
@@ -268 +284 @@
     }
 
-    pShader->id = id;
-    pShader->hwid = id;
+    pShader->id = stateId;
+    pShader->hwid = hwid;
     pShader->type = type;
     pShader->source = NULL;
@@ -276 +292 @@
     pShader->refCount = 0;
 
-    crHashtableAdd(g->glsl.shaders, id, pShader);
-}
-
-DECLEXPORT(void) STATE_APIENTRY crStateCreateProgram(GLuint id)
+    crHashtableAdd(g->glsl.shaders, stateId, pShader);
+
+    return stateId;
+}
+
+DECLEXPORT(GLuint) STATE_APIENTRY crStateCreateProgram(GLuint hwid)
 {
     CRGLSLProgram *pProgram;
     CRContext *g = GetCurrentContext();
-
-    pProgram = crStateGetProgramObj(id);
+    GLuint stateId = hwid;
+
+#ifdef IN_GUEST
+    pProgram = crStateGetProgramObj(stateId);
     if (pProgram)
     {
-        crWarning("Program object %d already exists!", id);
-        crStateDeleteProgram(id);
-        CRASSERT(!crStateGetProgramObj(id));
-    }
+        crWarning("Program object %d already exists!", stateId);
+        crStateDeleteProgram(stateId);
+        CRASSERT(!crStateGetProgramObj(stateId));
+    }
+#else
+    /* the id may not necesserily be hwid after save state restoration */
+    while ((pProgram = crStateGetProgramObj(stateId)) != NULL)
+    {
+        GLuint newStateId = stateId + 7;
+        crDebug("Program object %d already exists, generating a new one, %d", stateId, newStateId);
+        stateId = newStateId;
+    }
+#endif
 
     pProgram = (CRGLSLProgram *) crAlloc(sizeof(*pProgram));
@@ -299 +328 @@
     }
 
-    pProgram->id = id;
-    pProgram->hwid = id;
+    pProgram->id = stateId;
+    pProgram->hwid = hwid;
     pProgram->validated = GL_FALSE;
     pProgram->linked = GL_FALSE;
@@ -318 +347 @@
 #endif
 
-    crHashtableAdd(g->glsl.programs, id, pProgram);
+    crHashtableAdd(g->glsl.programs, stateId, pProgram);
+
+    return stateId;
 }