Changeset 23433 in vbox for trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c

Timestamp:

Sep 30, 2009 11:38:45 AM (15 years ago)

Author:

vboxsync

Message:

crOpenGL: fix snapshots for array uniforms

File:

• trunk/src/VBox/GuestHost/OpenGL/state_tracker/state_snapshot.c (modified) (5 diffs)

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

@@ -26 +26 @@
 #include "cr_mem.h"
 #include "cr_string.h"
+#include <stdio.h>
 
 #include <iprt/assert.h>
@@ -689 +690 @@
     int32_t rc;
     uint32_t ui32;
-    GLint maxUniformLen, activeUniforms=0, i;
+    GLint maxUniformLen, activeUniforms=0, uniformsCount=0, i, j;
+    GLchar *name;
+    GLenum type;
+    GLint size, location;
 
     rc = SSMR3PutMem(pSSM, &key, sizeof(key));
@@ -717 +721 @@
     diff_api.GetProgramiv(pProgram->hwid, GL_ACTIVE_UNIFORMS, &activeUniforms);
 
-    rc = SSMR3PutS32(pSSM, activeUniforms);
-    CRASSERT(rc == VINF_SUCCESS);
-
     if (activeUniforms>0)
     {
-        GLchar *name = (GLchar *) crAlloc(maxUniformLen*sizeof(GLchar));
+        name = (GLchar *) crAlloc((maxUniformLen+8)*sizeof(GLchar));
+
+        if (!name)
+        {
+            crWarning("crStateSaveGLSLProgramCB: out of memory");
+            return;
+        }
+    }
+
+    for (i=0; i<activeUniforms; ++i)
+    {
+        diff_api.GetActiveUniform(pProgram->hwid, i, maxUniformLen, NULL, &size, &type, name);
+        uniformsCount += size;
+    }
+    CRASSERT(uniformsCount>=activeUniforms);
+
+    rc = SSMR3PutS32(pSSM, uniformsCount);
+    CRASSERT(rc == VINF_SUCCESS);
+
+    if (activeUniforms>0)
+    {
         GLfloat fdata[16];
         GLint idata[16];
-        GLenum type;
-        GLint size;
+        char *pIndexStr=NULL;
 
         for (i=0; i<activeUniforms; ++i)
@@ -732 +752 @@
             diff_api.GetActiveUniform(pProgram->hwid, i, maxUniformLen, NULL, &size, &type, name);
 
-            /*@todo check if we'd reference all array elements or not*/
-            /*crap it fails as expected*/
-            if (size!=1) crWarning("@todo");
-
-            rc = SSMR3PutMem(pSSM, &type, sizeof(type));
-            CRASSERT(rc == VINF_SUCCESS);
-
-            crStateSaveString(name, pSSM);
+            if (size>1)
+            {
+                pIndexStr = crStrchr(name, '[');
+                if (!pIndexStr)
+                {
+                    pIndexStr = name+crStrlen(name);
+                }
+            }
+
+            for (j=0; j<size; ++j)
+            {
+                if (size>1)
+                {
+                    sprintf(pIndexStr, "[%i]", j);
+                    location = diff_api.GetUniformLocation(pProgram->hwid, name);
+                }
+                else
+                {
+                    location = i;
+                }
+
+                rc = SSMR3PutMem(pSSM, &type, sizeof(type));
+                CRASSERT(rc == VINF_SUCCESS);
+
+                crStateSaveString(name, pSSM);
             
-            if (GL_INT==type
-                || GL_INT_VEC2==type
-                || GL_INT_VEC3==type
-                || GL_INT_VEC4==type
-                || GL_BOOL==type
-                || GL_BOOL_VEC2==type
-                || GL_BOOL_VEC3==type
-                || GL_BOOL_VEC4==type
-                || GL_SAMPLER_1D==type
-                || GL_SAMPLER_2D==type
-                || GL_SAMPLER_3D==type
-                || GL_SAMPLER_CUBE==type
-                || GL_SAMPLER_1D_SHADOW==type
-                || GL_SAMPLER_2D_SHADOW==type)
-            {
-                diff_api.GetUniformiv(pProgram->hwid, i, &idata[0]);
-                rc = SSMR3PutMem(pSSM, &idata[0], crStateGetUniformSize(type)*sizeof(idata[0]));
-                CRASSERT(rc == VINF_SUCCESS);
-            }
-            else
-            {
-                diff_api.GetUniformfv(pProgram->hwid, i, &fdata[0]);
-                rc = SSMR3PutMem(pSSM, &fdata[0], crStateGetUniformSize(type)*sizeof(fdata[0]));
-                CRASSERT(rc == VINF_SUCCESS);
+                if (crStateIsIntUniform(type))
+                {
+                    diff_api.GetUniformiv(pProgram->hwid, location, &idata[0]);
+                    rc = SSMR3PutMem(pSSM, &idata[0], crStateGetUniformSize(type)*sizeof(idata[0]));
+                    CRASSERT(rc == VINF_SUCCESS);
+                }
+                else
+                {
+                    diff_api.GetUniformfv(pProgram->hwid, location, &fdata[0]);
+                    rc = SSMR3PutMem(pSSM, &fdata[0], crStateGetUniformSize(type)*sizeof(fdata[0]));
+                    CRASSERT(rc == VINF_SUCCESS);
+                }
             }
         }
@@ -1633 +1658 @@
                 pProgram->pUniforms[k].name = crStateLoadString(pSSM);
 
-                if (GL_INT==pProgram->pUniforms[k].type
-                    || GL_INT_VEC2==pProgram->pUniforms[k].type
-                    || GL_INT_VEC3==pProgram->pUniforms[k].type
-                    || GL_INT_VEC4==pProgram->pUniforms[k].type
-                    || GL_BOOL==pProgram->pUniforms[k].type
-                    || GL_BOOL_VEC2==pProgram->pUniforms[k].type
-                    || GL_BOOL_VEC3==pProgram->pUniforms[k].type
-                    || GL_BOOL_VEC4==pProgram->pUniforms[k].type
-                    || GL_SAMPLER_1D==pProgram->pUniforms[k].type
-                    || GL_SAMPLER_2D==pProgram->pUniforms[k].type
-                    || GL_SAMPLER_3D==pProgram->pUniforms[k].type
-                    || GL_SAMPLER_CUBE==pProgram->pUniforms[k].type
-                    || GL_SAMPLER_1D_SHADOW==pProgram->pUniforms[k].type
-                    || GL_SAMPLER_2D_SHADOW==pProgram->pUniforms[k].type)
+                if (crStateIsIntUniform(pProgram->pUniforms[k].type))
                 {
                     itemsize = sizeof(GLint);