]> git.cworth.org Git - apitrace/commitdiff
glstate: Handle GL_COMPUTE_SHADER.
authorJosé Fonseca <jose.r.fonseca@gmail.com>
Thu, 30 May 2013 07:40:06 +0000 (08:40 +0100)
committerJosé Fonseca <jose.r.fonseca@gmail.com>
Thu, 30 May 2013 07:40:06 +0000 (08:40 +0100)
retrace/glstate_shaders.cpp
specs/glparams.py

index aeead3bb5d889afe4483c1b680127b56039224f5..29d4768587abbe1b95f694b8aeb9ae51f5f5741c 100644 (file)
@@ -679,6 +679,7 @@ dumpShadersUniforms(JSONWriter &json, Context &context)
     GLint geometry_program = 0;
     GLint tess_control_program = 0;
     GLint tess_evaluation_program = 0;
+    GLint compute_program = 0;
 
     if (!context.ES) {
         glGetIntegerv(GL_PROGRAM_PIPELINE_BINDING, &pipeline);
@@ -688,6 +689,7 @@ dumpShadersUniforms(JSONWriter &json, Context &context)
             glGetProgramPipelineiv(pipeline, GL_GEOMETRY_SHADER, &geometry_program);
             glGetProgramPipelineiv(pipeline, GL_TESS_CONTROL_SHADER, &tess_control_program);
             glGetProgramPipelineiv(pipeline, GL_TESS_EVALUATION_SHADER, &tess_evaluation_program);
+            glGetProgramPipelineiv(pipeline, GL_COMPUTE_SHADER, &compute_program);
         }
     }
 
@@ -708,6 +710,7 @@ dumpShadersUniforms(JSONWriter &json, Context &context)
         dumpProgram(json, geometry_program);
         dumpProgram(json, tess_control_program);
         dumpProgram(json, tess_evaluation_program);
+        dumpProgram(json, compute_program);
     } else if (program) {
         dumpProgram(json, program);
     } else if (programObj) {
@@ -727,6 +730,7 @@ dumpShadersUniforms(JSONWriter &json, Context &context)
         dumpProgramUniformsStage(json, geometry_program, "GL_GEOMETRY_SHADER");
         dumpProgramUniformsStage(json, tess_control_program, "GL_TESS_CONTROL_SHADER");
         dumpProgramUniformsStage(json, tess_evaluation_program, "GL_TESS_EVALUATION_SHADER");
+        dumpProgramUniformsStage(json, compute_program, "GL_COMPUTE_SHADER");
     } else if (program) {
         dumpProgramUniforms(json, program);
     } else if (programObj) {
index faf28752f3e9f7c77cde6b28a9efac7533dc4de0..d2f5644127541e1ba16a1047c3e891cff60407d5 100644 (file)
@@ -3187,7 +3187,7 @@ parameters = [
     ("glGetTexLevelParameter", I,      1,      "GL_TEXTURE_BUFFER_OFFSET"),    # 0x919D
     ("glGetTexLevelParameter", I,      1,      "GL_TEXTURE_BUFFER_SIZE"),      # 0x919E
     ("glGet",  I,      1,      "GL_TEXTURE_BUFFER_OFFSET_ALIGNMENT"),  # 0x919F
-    ("",       X,      1,      "GL_COMPUTE_SHADER"),   # 0x91B9
+    ("glGetProgramPipeline",   I,      1,      "GL_COMPUTE_SHADER"),   # 0x91B9
     ("glGet",  I,      1,      "GL_MAX_COMPUTE_UNIFORM_BLOCKS"),       # 0x91BB
     ("glGet",  I,      1,      "GL_MAX_COMPUTE_TEXTURE_IMAGE_UNITS"),  # 0x91BC
     ("glGet",  I,      1,      "GL_MAX_COMPUTE_IMAGE_UNIFORMS"),       # 0x91BD