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 = [
return self.visitScalar(alias, args)
def visitEnum(self, enum, args):
- return self.visit(GLint, args)
+ return self.visitScalar(enum, args)
def visitBitmask(self, bitmask, args):
return self.visit(GLint, args)
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 ' json.writeString((const char *)%s);' % instance
def visitEnum(self, enum, instance):
- if enum.expr == 'GLenum':
+ if enum is GLboolean:
+ print ' dumpBoolean(json, %s);' % instance
+ elif enum is GLenum:
print ' dumpEnum(json, %s);' % instance
else:
- print ' json.writeNumber(%s);' % instance
+ assert False
+ 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
def visitArray(self, array, instance):
- index = '__i%u' % JsonWriter.__index
+ index = '_i%u' % JsonWriter.__index
JsonWriter.__index += 1
print ' json.beginArray();'
print ' for (unsigned %s = 0; %s < %s; ++%s) {' % (index, index, array.length, index)
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 ' switch (value) {'
+ print ' case GL_FALSE:'
+ print ' json.writeString("GL_FALSE");'
+ print ' break;'
+ print ' case GL_TRUE:'
+ print ' json.writeString("GL_TRUE");'
+ print ' break;'
+ print ' default:'
+ print ' json.writeInt(static_cast<GLint>(value));'
+ print ' break;'
+ print ' }'
+ print '}'
+ print
+
print 'const char *'
print 'enumToString(GLenum pname)'
print '{'
print '}'
print
- print 'static void'
- print 'dumpFramebufferAttachementParameters(JSONWriter &json, GLenum target, GLenum attachment)'
- print '{'
- self.dump_attachment_parameters('target', 'attachment')
- print '}'
- print
-
print 'void'
print 'dumpEnum(JSONWriter &json, GLenum pname)'
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();'
+ 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 '{'
+ self.dump_attachment_parameters('target', 'attachment')
+ print '}'
+ print
+
print 'void dumpParameters(JSONWriter &json, Context &context)'
print '{'
+ print ' ScopedAllocator _allocator;'
+ print ' (void)_allocator;'
+ print
print ' json.beginMember("parameters");'
print ' json.beginObject();'
def dump_light_params(self):
print ' GLint max_lights = 0;'
- print ' __glGetIntegerv(GL_MAX_LIGHTS, &max_lights);'
+ print ' _glGetIntegerv(GL_MAX_LIGHTS, &max_lights);'
print ' for (GLint index = 0; index < max_lights; ++index) {'
print ' GLenum light = GL_LIGHT0 + index;'
print ' if (glIsEnabled(light)) {'
print ' }'
print
+ def dump_sampler_params(self):
+ # Avoid crash on MacOSX
+ # XXX: The right fix would be to look at the support extensions..
+ import platform
+ if platform.system() == 'Darwin':
+ return
+
+ print ' // GL_SAMPLER_BINDING'
+ print ' flushErrors();'
+ print ' GLint sampler_binding = 0;'
+ print ' glGetIntegerv(GL_SAMPLER_BINDING, &sampler_binding);'
+ print ' if (glGetError() != GL_NO_ERROR) {'
+ print ' flushErrors();'
+ print ' } else {'
+ 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();'
+ 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'
def dump_vertex_attribs(self):
print ' GLint max_vertex_attribs = 0;'
- print ' __glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attribs);'
+ print ' _glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &max_vertex_attribs);'
print ' for (GLint index = 0; index < max_vertex_attribs; ++index) {'
print ' char name[32];'
print ' snprintf(name, sizeof name, "GL_VERTEX_ATTRIB_ARRAY%i", index);'
print ' glGetIntegerv(GL_MAX_TEXTURE_COORDS, &max_texture_coords);'
print ' GLint max_combined_texture_image_units = 0;'
print ' glGetIntegerv(GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS, &max_combined_texture_image_units);'
- print ' GLint max_units = std::min(std::max(max_combined_texture_image_units, max_texture_coords), 2);'
+ print ' GLint max_units = std::max(std::max(max_combined_texture_image_units, max_texture_coords), 2);'
print ' for (GLint unit = 0; unit < max_units; ++unit) {'
print ' char name[32];'
print ' snprintf(name, sizeof name, "GL_TEXTURE%i", unit);'
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.writeBoolMember("%s", enabled);' % target
- 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();'
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]
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)
projects / apitrace / blobdiff