Add depth info to the surfaces.

[apitrace] / glstate.cpp

diff --git a/glstate.cpp b/glstate.cpp
index 29ec26da0bc8acc99730693af1fcb5da66df54f4..9445645379608dcbf9765165879b93a5b9b8d125 100644 (file)
--- a/glstate.cpp
+++ b/glstate.cpp
@@ -151,14 +151,8 @@ getShaderObjSource(ShaderMap &shaderMap, GLhandleARB shaderObj)
 
 
 static inline void
-dumpCurrentProgram(JSONWriter &json)
+dumpProgram(JSONWriter &json, GLint program)
 {
-    GLint program = 0;
-    glGetIntegerv(GL_CURRENT_PROGRAM, &program);
-    if (!program) {
-        return;
-    }
-
     GLint attached_shaders = 0;
     glGetProgramiv(program, GL_ATTACHED_SHADERS, &attached_shaders);
     if (!attached_shaders) {
@@ -185,13 +179,8 @@ dumpCurrentProgram(JSONWriter &json)
 
 
 static inline void
-dumpCurrentProgramObj(JSONWriter &json)
+dumpProgramObj(JSONWriter &json, GLhandleARB programObj)
 {
-    GLhandleARB programObj = glGetHandleARB(GL_PROGRAM_OBJECT_ARB);
-    if (!programObj) {
-        return;
-    }
-
     GLint attached_shaders = 0;
     glGetObjectParameterivARB(programObj, GL_OBJECT_ATTACHED_OBJECTS_ARB, &attached_shaders);
     if (!attached_shaders) {
@@ -216,10 +205,33 @@ dumpCurrentProgramObj(JSONWriter &json)
     }
 }
 
+/*
+ * When fetching the uniform name of an array we usually get name[0]
+ * so we need to cut the trailing "[0]" in order to properly construct
+ * array names later. Otherwise we endup with stuff like
+ * uniformArray[0][0],
+ * uniformArray[0][1],
+ * instead of
+ * uniformArray[0],
+ * uniformArray[1].
+ */
+static std::string
+resolveUniformName(const GLchar *name,  GLint size)
+{
+    std::string qualifiedName(name);
+    if (size > 1) {
+        std::string::size_type nameLength = qualifiedName.length();
+        static const char * const arrayStart = "[0]";
+        static const int arrayStartLen = 3;
+        if (qualifiedName.rfind(arrayStart) == (nameLength - arrayStartLen)) {
+            qualifiedName = qualifiedName.substr(0, nameLength - 3);
+        }
+    }
+    return qualifiedName;
+}
 
 static void
 dumpUniform(JSONWriter &json, GLint program, GLint size, GLenum type, const GLchar *name) {
-    
     GLenum elemType;
     GLint numElems;
     __gl_uniform_size(type, elemType, numElems);
@@ -234,9 +246,11 @@ dumpUniform(JSONWriter &json, GLint program, GLint size, GLenum type, const GLch
 
     GLint i, j;
 
+    std::string qualifiedName = resolveUniformName(name, size);
+
     for (i = 0; i < size; ++i) {
         std::stringstream ss;
-        ss << name;
+        ss << qualifiedName;
 
         if (size > 1) {
             ss << '[' << i << ']';
@@ -312,9 +326,11 @@ dumpUniformARB(JSONWriter &json, GLhandleARB programObj, GLint size, GLenum type
 
     GLint i, j;
 
+    std::string qualifiedName = resolveUniformName(name, size);
+
     for (i = 0; i < size; ++i) {
         std::stringstream ss;
-        ss << name;
+        ss << qualifiedName;
 
         if (size > 1) {
             ss << '[' << i << ']';
@@ -368,14 +384,8 @@ dumpUniformARB(JSONWriter &json, GLhandleARB programObj, GLint size, GLenum type
 
 
 static inline void
-dumpCurrentProgramUniforms(JSONWriter &json)
+dumpProgramUniforms(JSONWriter &json, GLint program)
 {
-    GLint program = 0;
-    glGetIntegerv(GL_CURRENT_PROGRAM, &program);
-    if (!program) {
-        return;
-    }
-
     GLint active_uniforms = 0;
     glGetProgramiv(program, GL_ACTIVE_UNIFORMS, &active_uniforms);
     if (!active_uniforms) {
@@ -403,13 +413,8 @@ dumpCurrentProgramUniforms(JSONWriter &json)
 
 
 static inline void
-dumpCurrentProgramUniformsARB(JSONWriter &json)
+dumpProgramObjUniforms(JSONWriter &json, GLhandleARB programObj)
 {
-    GLhandleARB programObj = glGetHandleARB(GL_PROGRAM_OBJECT_ARB);
-    if (!programObj) {
-        return;
-    }
-
     GLint active_uniforms = 0;
     glGetObjectParameterivARB(programObj, GL_OBJECT_ACTIVE_UNIFORMS_ARB, &active_uniforms);
     if (!active_uniforms) {
@@ -463,7 +468,7 @@ dumpArbProgram(JSONWriter &json, GLenum target)
 
 
 static inline void
-dumpProgramUniformsARB(JSONWriter &json, GLenum target, const char *prefix)
+dumpArbProgramUniforms(JSONWriter &json, GLenum target, const char *prefix)
 {
     if (!glIsEnabled(target)) {
         return;
@@ -477,7 +482,7 @@ dumpProgramUniformsARB(JSONWriter &json, GLenum target, const char *prefix)
 
     GLint max_program_local_parameters = 0;
     glGetProgramivARB(target, GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB, &max_program_local_parameters);
-    for (GLuint index = 0; index < max_program_local_parameters; ++index) {
+    for (GLint index = 0; index < max_program_local_parameters; ++index) {
         GLdouble params[4] = {0, 0, 0, 0};
         glGetProgramLocalParameterdvARB(target, index, params);
 
@@ -486,7 +491,7 @@ dumpProgramUniformsARB(JSONWriter &json, GLenum target, const char *prefix)
         }
 
         char name[256];
-        snprintf(name, sizeof name, "%sprogram.local[%u]", prefix, index);
+        snprintf(name, sizeof name, "%sprogram.local[%i]", prefix, index);
 
         json.beginMember(name);
         json.beginArray();
@@ -500,7 +505,7 @@ dumpProgramUniformsARB(JSONWriter &json, GLenum target, const char *prefix)
 
     GLint max_program_env_parameters = 0;
     glGetProgramivARB(target, GL_MAX_PROGRAM_ENV_PARAMETERS_ARB, &max_program_env_parameters);
-    for (GLuint index = 0; index < max_program_env_parameters; ++index) {
+    for (GLint index = 0; index < max_program_env_parameters; ++index) {
         GLdouble params[4] = {0, 0, 0, 0};
         glGetProgramEnvParameterdvARB(target, index, params);
 
@@ -509,7 +514,7 @@ dumpProgramUniformsARB(JSONWriter &json, GLenum target, const char *prefix)
         }
 
         char name[256];
-        snprintf(name, sizeof name, "%sprogram.env[%u]", prefix, index);
+        snprintf(name, sizeof name, "%sprogram.env[%i]", prefix, index);
 
         json.beginMember(name);
         json.beginArray();
@@ -524,28 +529,36 @@ dumpProgramUniformsARB(JSONWriter &json, GLenum target, const char *prefix)
 
 
 static inline void
-dumpShaders(JSONWriter &json)
+dumpShadersUniforms(JSONWriter &json)
 {
+    GLint program = 0;
+    glGetIntegerv(GL_CURRENT_PROGRAM, &program);
+
+    GLhandleARB programObj = glGetHandleARB(GL_PROGRAM_OBJECT_ARB);
+
     json.beginMember("shaders");
     json.beginObject();
-    dumpCurrentProgram(json);
-    dumpCurrentProgramObj(json);
-    dumpArbProgram(json, GL_FRAGMENT_PROGRAM_ARB);
-    dumpArbProgram(json, GL_VERTEX_PROGRAM_ARB);
+    if (program) {
+        dumpProgram(json, program);
+    } else if (programObj) {
+        dumpProgramObj(json, programObj);
+    } else {
+        dumpArbProgram(json, GL_FRAGMENT_PROGRAM_ARB);
+        dumpArbProgram(json, GL_VERTEX_PROGRAM_ARB);
+    }
     json.endObject();
     json.endMember(); // shaders
-}
-
 
-static inline void
-dumpUniforms(JSONWriter &json)
-{
     json.beginMember("uniforms");
     json.beginObject();
-    dumpCurrentProgramUniforms(json);
-    dumpCurrentProgramUniformsARB(json);
-    dumpProgramUniformsARB(json, GL_FRAGMENT_PROGRAM_ARB, "fp.");
-    dumpProgramUniformsARB(json, GL_VERTEX_PROGRAM_ARB, "vp.");
+    if (program) {
+        dumpProgramUniforms(json, program);
+    } else if (programObj) {
+        dumpProgramObjUniforms(json, programObj);
+    } else {
+        dumpArbProgramUniforms(json, GL_FRAGMENT_PROGRAM_ARB, "fp.");
+        dumpArbProgramUniforms(json, GL_VERTEX_PROGRAM_ARB, "vp.");
+    }
     json.endObject();
     json.endMember(); // uniforms
 }
@@ -605,7 +618,7 @@ dumpTextureImage(JSONWriter &json, GLenum target, GLint level)
         json.beginMember("__data__");
         char *pngBuffer;
         int pngBufferSize;
-        Image::writePixelsToBuffer(pixels, width, height, 4, false, &pngBuffer, &pngBufferSize);
+        image::writePixelsToBuffer(pixels, width, height, 4, true, &pngBuffer, &pngBufferSize);
         json.writeBase64(pngBuffer, pngBufferSize);
         free(pngBuffer);
         json.endMember(); // __data__
@@ -858,7 +871,7 @@ getFramebufferAttachmentSize(GLenum target, GLenum attachment, GLint *width, GLi
 }
 
 
-Image::Image *
+image::Image *
 getDrawBufferImage(GLenum format) {
     GLint channels = __gl_format_channels(format);
     if (channels > 4) {
@@ -890,7 +903,7 @@ getDrawBufferImage(GLenum format) {
         }
     }
 
-    Image::Image *image = new Image::Image(width, height, channels, true);
+    image::Image *image = new image::Image(width, height, channels, true);
     if (!image) {
         return NULL;
     }
@@ -963,7 +976,7 @@ dumpReadBufferImage(JSONWriter &json, GLint width, GLint height, GLenum format)
     json.beginMember("__data__");
     char *pngBuffer;
     int pngBufferSize;
-    Image::writePixelsToBuffer(pixels, width, height, channels, false, &pngBuffer, &pngBufferSize);
+    image::writePixelsToBuffer(pixels, width, height, channels, true, &pngBuffer, &pngBufferSize);
     //std::cerr <<" Before = "<<(width * height * channels * sizeof *pixels)
     //          <<", after = "<<pngBufferSize << ", ratio = " << double(width * height * channels * sizeof *pixels)/pngBufferSize;
     json.writeBase64(pngBuffer, pngBufferSize);
@@ -1320,8 +1333,7 @@ void dumpCurrentContext(std::ostream &os)
 #endif
 
     dumpParameters(json);
-    dumpShaders(json);
-    dumpUniforms(json);
+    dumpShadersUniforms(json);
     dumpTextures(json);
     dumpFramebuffer(json);