texture_targets = [
('GL_TEXTURE_1D', 'GL_TEXTURE_BINDING_1D'),
+ ('GL_TEXTURE_1D_ARRAY', 'GL_TEXTURE_BINDING_1D_ARRAY'),
('GL_TEXTURE_2D', 'GL_TEXTURE_BINDING_2D'),
+ ('GL_TEXTURE_2D_ARRAY', 'GL_TEXTURE_BINDING_2D_ARRAY'),
+ ('GL_TEXTURE_2D_MULTISAMPLE', 'GL_TEXTURE_BINDING_2D_MULTISAMPLE'),
+ ('GL_TEXTURE_2D_MULTISAMPLE_ARRAY', 'GL_TEXTURE_BINDING_2D_MULTISAMPLE_ARRAY'),
('GL_TEXTURE_3D', 'GL_TEXTURE_BINDING_3D'),
('GL_TEXTURE_RECTANGLE', 'GL_TEXTURE_BINDING_RECTANGLE'),
- ('GL_TEXTURE_CUBE_MAP', 'GL_TEXTURE_BINDING_CUBE_MAP')
+ ('GL_TEXTURE_CUBE_MAP', 'GL_TEXTURE_BINDING_CUBE_MAP'),
+ ('GL_TEXTURE_CUBE_MAP_ARRAY', 'GL_TEXTURE_BINDING_CUBE_MAP_ARRAY'),
]
framebuffer_targets = [
elem_type = self.inflector.reduced_type(array.type)
inflection = self.inflector.inflect(array.type)
assert inflection.endswith('v')
- print ' %s %s[%s + 1];' % (elem_type, temp_name, 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)
+ array_length = array.length
+ if array_length.isdigit():
+ # Static integer length
+ print ' %s %s[%s + 1];' % (elem_type, temp_name, array_length)
+ else:
+ # Put the length in a variable to avoid recomputing it every time
+ print ' size_t _%s_length = %s;' % (temp_name, array_length)
+ array_length = '_%s_length' % temp_name
+ # Allocate a dynamic sized array
+ 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 ' 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)
+ print ' assert(%s[%s] == (%s)0xdeadc0de);' % (temp_name, array_length, elem_type)
return temp_name
def visitOpaque(self, pointer, args):
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):
def visitLiteral(self, literal, instance):
if literal.kind == 'Bool':
print ' json.writeBool(%s);' % instance
- elif literal.kind in ('SInt', 'Uint', 'Float', 'Double'):
- print ' json.writeNumber(%s);' % instance
+ elif literal.kind in ('SInt', 'Uint'):
+ print ' json.writeInt(%s);' % instance
+ elif literal.kind in ('Float', 'Double'):
+ print ' json.writeFloat(%s);' % instance
else:
raise NotImplementedError
print ' dumpEnum(json, %s);' % instance
else:
assert False
- print ' json.writeNumber(%s);' % instance
+ print ' json.writeInt(%s);' % instance
def visitBitmask(self, bitmask, instance):
raise NotImplementedError
self.visit(alias.type, instance)
def visitOpaque(self, opaque, instance):
- print ' json.writeNumber((size_t)%s);' % instance
+ print ' json.writeInt((size_t)%s);' % instance
__index = 0
pass
def dump(self):
+ print '#include <assert.h>'
print '#include <string.h>'
print
print '#include "json.hpp"'
+ print '#include "scoped_allocator.hpp"'
print '#include "glproc.hpp"'
print '#include "glsize.hpp"'
print '#include "glstate.hpp"'
print 'namespace glstate {'
print
+ print 'static void'
+ print 'flushErrors(void) {'
+ print ' while (glGetError() != GL_NO_ERROR) {}'
+ print '}'
+ print
+
print 'void'
print 'dumpBoolean(JSONWriter &json, GLboolean value)'
print '{'
print ' json.writeString("GL_TRUE");'
print ' break;'
print ' default:'
- print ' json.writeNumber(static_cast<GLint>(value));'
+ print ' json.writeInt(static_cast<GLint>(value));'
print ' break;'
print ' }'
print '}'
print ' if (s) {'
print ' json.writeString(s);'
print ' } else {'
- print ' json.writeNumber(pname);'
+ print ' json.writeInt(pname);'
+ print ' }'
+ print '}'
+ print
+
+ print 'static void'
+ print 'dumpTextureTargetParameters(JSONWriter &json, Context &context, GLenum target, GLenum binding_param)'
+ print '{'
+ print ' GLboolean enabled = GL_FALSE;'
+ print ' GLint binding = 0;'
+ print ' glGetBooleanv(target, &enabled);'
+ print ' json.beginMember(enumToString(target));'
+ print ' dumpBoolean(json, enabled);'
+ print ' json.endMember();'
+ print ' glGetIntegerv(binding_param, &binding);'
+ print ' json.writeIntMember(enumToString(binding_param), binding);'
+ 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;'
+ print ' if (target == GL_TEXTURE_CUBE_MAP ||'
+ print ' target == GL_TEXTURE_CUBE_MAP_ARRAY) {'
+ print ' // Must pick a face'
+ print ' levelTarget = GL_TEXTURE_CUBE_MAP_POSITIVE_X;'
+ print ' } else {'
+ print ' levelTarget = target;'
+ print ' }'
+ self.dump_atoms(glGetTexLevelParameter, 'levelTarget', '0')
+ print ' }'
+ print ' json.endObject();'
+ print ' json.endMember(); // target'
print ' }'
print '}'
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 '}'
print 'void dumpParameters(JSONWriter &json, Context &context)'
print '{'
+ print ' ScopedAllocator _allocator;'
+ print ' (void)_allocator;'
+ print
print ' json.beginMember("parameters");'
print ' json.beginObject();'
self.dump_program_params()
self.dump_texture_parameters()
self.dump_framebuffer_parameters()
+ self.dump_labels()
print ' json.endObject();'
print ' json.endMember(); // parameters'
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'
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',
print ' json.beginMember(name);'
print ' glActiveTexture(GL_TEXTURE0 + unit);'
print ' json.beginObject();'
- print ' GLboolean enabled;'
- print ' GLint binding;'
print
for target, binding in texture_targets:
- print ' // %s' % target
- print ' enabled = GL_FALSE;'
- print ' glGetBooleanv(%s, &enabled);' % target
- print ' json.beginMember("%s");' % target
- print ' dumpBoolean(json, enabled);'
- print ' json.endMember();'
- print ' binding = 0;'
- print ' glGetIntegerv(%s, &binding);' % binding
- print ' json.writeNumberMember("%s", binding);' % binding
- print ' if (enabled || binding) {'
- print ' json.beginMember("%s");' % target
- print ' json.beginObject();'
- self.dump_atoms(glGetTexParameter, target)
- print ' if (!context.ES) {'
- # We only dump the first level parameters
- self.dump_atoms(glGetTexLevelParameter, target, "0")
- print ' }'
- print ' json.endObject();'
- print ' json.endMember(); // %s' % target
- print ' }'
- print
+ 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();'
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 ' }'
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 ' }'
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 ' assert(glGetError() == GL_NO_ERROR);'
+ print ' flushErrors();'
type, value = getter(*args)
print ' if (glGetError() != GL_NO_ERROR) {'
#print ' std::cerr << "warning: %s(%s) failed\\n";' % (inflection, name)
- print ' while (glGetError() != GL_NO_ERROR) {}'
+ print ' flushErrors();'
print ' } else {'
print ' json.beginMember("%s");' % name
JsonWriter().visit(type, value)