X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fglstate_params.py;h=434536dd3073bdeecb166f8c1c7af114b7b4183a;hb=d9d9d22837705de6a2c42ad3f9b23223a2b98fe0;hp=54e0c673e22b822356fe18b2ed63eeef0a0ec439;hpb=2143a066d7ebb52ea48e25da4f9de70b65c0ab79;p=apitrace diff --git a/retrace/glstate_params.py b/retrace/glstate_params.py index 54e0c67..434536d 100644 --- a/retrace/glstate_params.py +++ b/retrace/glstate_params.py @@ -173,7 +173,9 @@ class StateGetter(Visitor): print ' %s *%s = _allocator.alloc<%s>(%s + 1);' % (elem_type, temp_name, elem_type, array_length) print ' memset(%s, 0, %s * sizeof *%s);' % (temp_name, array_length, temp_name) print ' %s[%s] = (%s)0xdeadc0de;' % (temp_name, array_length, elem_type) - print ' %s(%s, %s);' % (inflection + self.suffix, ', '.join(args), temp_name) + print ' if (%s) {' % array_length + print ' %s(%s, %s);' % (inflection + self.suffix, ', '.join(args), temp_name) + print ' }' # Simple buffer overflow detection print ' assert(%s[%s] == (%s)0xdeadc0de);' % (temp_name, array_length, elem_type) return temp_name @@ -206,6 +208,7 @@ glGetShader = StateGetter('glGetShaderiv', {I: 'iv'}) glGetProgram = StateGetter('glGetProgram', {I: 'iv'}) glGetProgramARB = StateGetter('glGetProgram', {I: 'iv', F: 'fv', S: 'Stringv'}, 'ARB') glGetFramebufferAttachmentParameter = StateGetter('glGetFramebufferAttachmentParameter', {I: 'iv'}) +glGetSamplerParameter = StateGetter('glGetSamplerParameter', {I: 'iv', F: 'fv'}) class JsonWriter(Visitor): @@ -342,6 +345,7 @@ class StateDumper: print ' if (enabled || binding) {' print ' json.beginMember(enumToString(target));' print ' json.beginObject();' + print ' dumpObjectLabel(json, context, GL_TEXTURE, binding, "GL_TEXTURE_LABEL");' self.dump_atoms(glGetTexParameter, 'target') print ' if (!context.ES) {' print ' GLenum levelTarget;' @@ -361,7 +365,7 @@ class StateDumper: print print 'static void' - print 'dumpFramebufferAttachementParameters(JSONWriter &json, GLenum target, GLenum attachment)' + print 'dumpFramebufferAttachementParameters(JSONWriter &json, Context &context, GLenum target, GLenum attachment)' print '{' self.dump_attachment_parameters('target', 'attachment') print '}' @@ -383,6 +387,7 @@ class StateDumper: self.dump_program_params() self.dump_texture_parameters() self.dump_framebuffer_parameters() + self.dump_labels() print ' json.endObject();' print ' json.endMember(); // parameters' @@ -418,6 +423,25 @@ class StateDumper: print ' }' print + def dump_sampler_params(self): + print ' // GL_SAMPLER_BINDING' + print ' if (context.ARB_sampler_objects) {' + print ' GLint sampler_binding = 0;' + print ' glGetIntegerv(GL_SAMPLER_BINDING, &sampler_binding);' + print ' json.beginMember("GL_SAMPLER_BINDING");' + print ' json.writeInt(sampler_binding);' + print ' json.endMember();' + print ' if (sampler_binding) {' + print ' json.beginMember("GL_SAMPLER");' + print ' json.beginObject();' + print ' dumpObjectLabel(json, context, GL_SAMPLER, sampler_binding, "GL_SAMPLER_LABEL");' + for _, _, name in glGetSamplerParameter.iter(): + self.dump_atom(glGetSamplerParameter, 'sampler_binding', name) + print ' json.endObject();' + print ' json.endMember(); // GL_SAMPLER' + print ' }' + print ' }' + def texenv_param_target(self, name): if name == 'GL_TEXTURE_LOD_BIAS': return 'GL_TEXTURE_FILTER_CONTROL' @@ -446,11 +470,50 @@ class StateDumper: print ' json.beginMember(name);' print ' json.beginObject();' self.dump_atoms(glGetVertexAttrib, 'index') + + # Dump vertex attrib buffer label + print ' GLint buffer_binding = 0;' + print ' glGetVertexAttribiv(index, GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING, &buffer_binding);' + print ' dumpObjectLabel(json, context, GL_BUFFER, buffer_binding, "GL_VERTEX_ATTRIB_ARRAY_BUFFER_LABEL");' + print ' json.endObject();' print ' json.endMember(); // GL_VERTEX_ATTRIB_ARRAYi' print ' }' print + object_bindings = [ + ('GL_BUFFER', 'GL_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_COLOR_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_EDGE_FLAG_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_ELEMENT_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_INDEX_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_NORMAL_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_TRANSFORM_FEEDBACK_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_VERTEX_ARRAY_BUFFER_BINDING'), + ('GL_BUFFER', 'GL_WEIGHT_ARRAY_BUFFER_BINDING'), + ('GL_FRAMEBUFFER', 'GL_DRAW_FRAMEBUFFER_BINDING'), + ('GL_FRAMEBUFFER', 'GL_READ_FRAMEBUFFER_BINDING'), + ('GL_PROGRAM', 'GL_CURRENT_PROGRAM'), + ('GL_PROGRAM_PIPELINE', 'GL_PROGRAM_PIPELINE_BINDING'), + ('GL_RENDERBUFFER', 'GL_RENDERBUFFER_BINDING'), + ('GL_TRANSFORM_FEEDBACK', 'GL_TRANSFORM_FEEDBACK_BINDING'), + ('GL_VERTEX_ARRAY', 'GL_VERTEX_ARRAY_BINDING'), + ] + + def dump_labels(self): + for object_type, object_binding in self.object_bindings: + member_name = object_binding.replace('BINDING', 'LABEL') + if member_name == object_binding: + member_name += '_LABEL' + print ' {' + print ' GLint binding = 0;' + print ' glGetIntegerv(%s, &binding);' % object_binding + print ' dumpObjectLabel(json, context, %s, binding, "%s");' % (object_type, member_name) + print ' }' + program_targets = [ 'GL_FRAGMENT_PROGRAM_ARB', 'GL_VERTEX_PROGRAM_ARB', @@ -484,6 +547,7 @@ class StateDumper: for target, binding in texture_targets: print ' dumpTextureTargetParameters(json, context, %s, %s);' % (target, binding) print ' if (unit < max_texture_coords) {' + self.dump_sampler_params() self.dump_texenv_params() print ' }' print ' json.endObject();' @@ -505,12 +569,13 @@ class StateDumper: print ' if (framebuffer) {' print ' json.beginMember("%s");' % target print ' json.beginObject();' + print ' dumpObjectLabel(json, context, GL_FRAMEBUFFER, framebuffer, "GL_FRAMEBUFFER_LABEL");' print ' for (GLint i = 0; i < max_color_attachments; ++i) {' print ' GLint color_attachment = GL_COLOR_ATTACHMENT0 + i;' - print ' dumpFramebufferAttachementParameters(json, %s, color_attachment);' % target + print ' dumpFramebufferAttachementParameters(json, context, %s, color_attachment);' % target print ' }' - print ' dumpFramebufferAttachementParameters(json, %s, GL_DEPTH_ATTACHMENT);' % target - print ' dumpFramebufferAttachementParameters(json, %s, GL_STENCIL_ATTACHMENT);' % target + print ' dumpFramebufferAttachementParameters(json, context, %s, GL_DEPTH_ATTACHMENT);' % target + print ' dumpFramebufferAttachementParameters(json, context, %s, GL_STENCIL_ATTACHMENT);' % target print ' json.endObject();' print ' json.endMember(); // %s' % target print ' }' @@ -526,6 +591,9 @@ class StateDumper: print ' json.beginMember(enumToString(%s));' % attachment print ' json.beginObject();' self.dump_atoms(glGetFramebufferAttachmentParameter, target, attachment) + print ' GLint object_name = 0;' + print ' glGetFramebufferAttachmentParameteriv(%s, %s, GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME, &object_name);' % (target, attachment) + print ' dumpObjectLabel(json, context, object_type, object_name, "GL_FRAMEBUFFER_ATTACHMENT_OBJECT_LABEL");' print ' json.endObject();' print ' json.endMember(); // GL_x_ATTACHMENT' print ' }' @@ -533,17 +601,11 @@ class StateDumper: def dump_atoms(self, getter, *args): for _, _, name in getter.iter(): - self.dump_atom(getter, *(args + (name,))) + self.dump_atom(getter, *(args + (name,))) def dump_atom(self, getter, *args): name = args[-1] - # Avoid crash on MacOSX - # XXX: The right fix would be to look at the support extensions.. - import platform - if name == 'GL_SAMPLER_BINDING' and platform.system() == 'Darwin': - return - print ' // %s' % name print ' {' print ' flushErrors();'