cli: Add a new "apitrace diff" command.

[apitrace] / glstate.cpp

diff --git a/glstate.cpp b/glstate.cpp
index b07550966b8c403b9dd1618731773e427a09a852..db1128a9229e2fe8865a7b6713de781410d8b929 100644 (file)
--- a/glstate.cpp
+++ b/glstate.cpp
@@ -121,8 +121,14 @@ getShaderObjSource(ShaderMap &shaderMap, GLhandleARB shaderObj)
         return;
     }
 
+    GLint object_type = 0;
+    glGetObjectParameterivARB(shaderObj, GL_OBJECT_TYPE_ARB, &object_type);
+    if (object_type != GL_SHADER_OBJECT_ARB) {
+        return;
+    }
+
     GLint shader_type = 0;
-    glGetObjectParameterivARB(shaderObj, GL_OBJECT_TYPE_ARB, &shader_type);
+    glGetObjectParameterivARB(shaderObj, GL_OBJECT_SUBTYPE_ARB, &shader_type);
     if (!shader_type) {
         return;
     }
@@ -145,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) {
@@ -179,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) {
@@ -362,14 +357,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) {
@@ -397,13 +386,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) {
@@ -457,7 +441,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;
@@ -471,7 +455,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);
 
@@ -480,7 +464,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();
@@ -494,7 +478,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);
 
@@ -503,7 +487,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();
@@ -518,28 +502,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
 }
@@ -599,7 +591,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__
@@ -852,7 +844,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) {
@@ -884,7 +876,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;
     }
@@ -957,7 +949,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);
@@ -1314,8 +1306,7 @@ void dumpCurrentContext(std::ostream &os)
 #endif
 
     dumpParameters(json);
-    dumpShaders(json);
-    dumpUniforms(json);
+    dumpShadersUniforms(json);
     dumpTextures(json);
     dumpFramebuffer(json);