print ' void *map;'
print ' GLint length;'
print ' bool write;'
+ print ' bool explicit_flush;'
print '};'
print
for target in self.buffer_targets:
# Emit a fake function
print ' {'
print ' static const Trace::FunctionSig &__sig = %s ? __glEnableClientState_sig : __glDisableClientState_sig;' % flag_name
- print ' unsigned __call = Trace::BeginEnter(__sig);'
- print ' Trace::BeginArg(0);'
+ print ' unsigned __call = __writer.beginEnter(&__sig);'
+ print ' __writer.beginArg(0);'
dump_instance(glapi.GLenum, enable_name)
- print ' Trace::EndArg();'
- print ' Trace::EndEnter();'
- print ' Trace::BeginLeave(__call);'
- print ' Trace::EndLeave();'
+ print ' __writer.endArg();'
+ print ' __writer.endEnter();'
+ print ' __writer.beginLeave(__call);'
+ print ' __writer.endLeave();'
print ' }'
print ' return;'
print ' __trace_user_arrays(maxindex);'
print ' }'
- # Emit a fake memcpy on
- if function.name in ('glUnmapBuffer', 'glUnmapBufferARB'):
+ # Emit a fake memcpy on buffer uploads
+ if function.name in ('glUnmapBuffer', 'glUnmapBufferARB', ):
print ' struct buffer_mapping *mapping = get_buffer_mapping(target);'
- print ' if (mapping && mapping->write) {'
- print ' unsigned __call = Trace::BeginEnter(__memcpy_sig);'
- print ' Trace::BeginArg(0);'
- print ' Trace::LiteralOpaque(mapping->map);'
- print ' Trace::EndArg();'
- print ' Trace::BeginArg(1);'
- print ' Trace::LiteralBlob(mapping->map, mapping->length);'
- print ' Trace::EndArg();'
- print ' Trace::BeginArg(2);'
- print ' Trace::LiteralUInt(mapping->length);'
- print ' Trace::EndArg();'
- print ' Trace::EndEnter();'
- print ' Trace::BeginLeave(__call);'
- print ' Trace::EndLeave();'
+ print ' if (mapping && mapping->write && !mapping->explicit_flush) {'
+ self.emit_memcpy('mapping->map', 'mapping->map', 'mapping->length')
+ print ' }'
+ if function.name in ('glFlushMappedBufferRange', 'glFlushMappedBufferRangeAPPLE'):
+ # TODO: avoid copying [0, offset] bytes
+ print ' struct buffer_mapping *mapping = get_buffer_mapping(target);'
+ print ' if (mapping) {'
+ if function.name.endswith('APPLE'):
+ print ' GLsizeiptr length = size;'
+ print ' mapping->explicit_flush = true;'
+ print ' //assert(offset + length <= mapping->length);'
+ self.emit_memcpy('mapping->map', 'mapping->map', 'offset + length')
+ print ' }'
+ # FIXME: glFlushMappedNamedBufferRangeEXT
+
+ # Don't leave vertex attrib locations to chance. Instead emit fake
+ # glBindAttribLocation calls to ensure that the same locations will be
+ # used when retracing. Trying to remap locations after the fact would
+ # be an herculian task given that vertex attrib locations appear in
+ # many entry-points, including non-shader related ones.
+ if function.name == 'glLinkProgram':
+ Tracer.dispatch_function(self, function)
+ print ' GLint active_attributes = 0;'
+ print ' __glGetProgramiv(program, GL_ACTIVE_ATTRIBUTES, &active_attributes);'
+ print ' for (GLuint attrib = 0; attrib < active_attributes; ++attrib) {'
+ print ' GLint size = 0;'
+ print ' GLenum type = 0;'
+ print ' GLchar name[256];'
+ # TODO: Use ACTIVE_ATTRIBUTE_MAX_LENGTH instead of 256
+ print ' __glGetActiveAttrib(program, attrib, sizeof name, NULL, &size, &type, name);'
+ print " if (name[0] != 'g' || name[1] != 'l' || name[2] != '_') {"
+ print ' GLint location = __glGetAttribLocation(program, name);'
+ print ' if (location >= 0) {'
+ bind_function = glapi.glapi.get_function_by_name('glBindAttribLocation')
+ self.fake_call(bind_function, ['program', 'location', 'name'])
+ print ' }'
+ print ' }'
+ print ' }'
+ if function.name == 'glLinkProgramARB':
+ Tracer.dispatch_function(self, function)
+ print ' GLint active_attributes = 0;'
+ print ' __glGetObjectParameterivARB(programObj, GL_OBJECT_ACTIVE_ATTRIBUTES_ARB, &active_attributes);'
+ print ' for (GLuint attrib = 0; attrib < active_attributes; ++attrib) {'
+ print ' GLint size = 0;'
+ print ' GLenum type = 0;'
+ print ' GLcharARB name[256];'
+ # TODO: Use ACTIVE_ATTRIBUTE_MAX_LENGTH instead of 256
+ print ' __glGetActiveAttribARB(programObj, attrib, sizeof name, NULL, &size, &type, name);'
+ print " if (name[0] != 'g' || name[1] != 'l' || name[2] != '_') {"
+ print ' GLint location = __glGetAttribLocationARB(programObj, name);'
+ print ' if (location >= 0) {'
+ bind_function = glapi.glapi.get_function_by_name('glBindAttribLocationARB')
+ self.fake_call(bind_function, ['programObj', 'location', 'name'])
+ print ' }'
+ print ' }'
print ' }'
Tracer.trace_function_impl_body(self, function)
+
+ def dispatch_function(self, function):
+ if function.name in ('glLinkProgram', 'glLinkProgramARB'):
+ # These functions have been dispatched already
+ return
+
+ Tracer.dispatch_function(self, function)
+
+ def emit_memcpy(self, dest, src, length):
+ print ' unsigned __call = __writer.beginEnter(&__memcpy_sig);'
+ print ' __writer.beginArg(0);'
+ print ' __writer.writeOpaque(%s);' % dest
+ print ' __writer.endArg();'
+ print ' __writer.beginArg(1);'
+ print ' __writer.writeBlob(%s, %s);' % (src, length)
+ print ' __writer.endArg();'
+ print ' __writer.beginArg(2);'
+ print ' __writer.writeUInt(%s);' % length
+ print ' __writer.endArg();'
+ print ' __writer.endEnter();'
+ print ' __writer.beginLeave(__call);'
+ print ' __writer.endLeave();'
buffer_targets = [
'ARRAY_BUFFER',
print ' mapping->length = 0;'
print ' __glGetBufferParameteriv(target, GL_BUFFER_SIZE, &mapping->length);'
print ' mapping->write = (access != GL_READ_ONLY);'
+ print ' mapping->explicit_flush = false;'
print ' }'
if function.name == 'glMapBufferRange':
print ' mapping->map = %s;' % (instance)
print ' mapping->length = length;'
print ' mapping->write = access & GL_MAP_WRITE_BIT;'
+ print ' mapping->explicit_flush = access & GL_MAP_FLUSH_EXPLICIT_BIT;'
print ' }'
boolean_names = [
print ' if (!__element_array_buffer) {'
if isinstance(arg.type, stdapi.Array):
Tracer.dump_arg_instance(self, function, arg)
- print ' Trace::BeginArray(%s);' % arg.type.length
+ print ' __writer.beginArray(%s);' % arg.type.length
print ' for(GLsizei i = 0; i < %s; ++i) {' % arg.type.length
- print ' Trace::BeginElement();'
- print ' Trace::LiteralBlob((const void *)%s, count[i]*__gl_type_size(type));' % (arg.name)
- print ' Trace::EndElement();'
+ print ' __writer.beginElement();'
+ print ' __writer.writeBlob((const void *)%s, count[i]*__gl_type_size(type));' % (arg.name)
+ print ' __writer.endElement();'
print ' }'
- print ' Trace::EndArray();'
+ print ' __writer.endArray();'
else:
- print ' Trace::LiteralBlob((const void *)%s, count*__gl_type_size(type));' % (arg.name)
+ print ' __writer.writeBlob((const void *)%s, count*__gl_type_size(type));' % (arg.name)
print ' } else {'
Tracer.dump_arg_instance(self, function, arg)
print ' }'
# Several GL state functions take GLenum symbolic names as
# integer/floats; so dump the symbolic name whenever possible
- if arg.type in (glapi.GLint, glapi.GLfloat) and arg.name == 'param':
+ if function.name.startswith('gl') \
+ and arg.type in (glapi.GLint, glapi.GLfloat) \
+ and arg.name == 'param':
assert arg.index > 0
assert function.args[arg.index - 1].name == 'pname'
assert function.args[arg.index - 1].type == glapi.GLenum
# Emit a fake function
self.array_trace_intermezzo(api, uppercase_name)
- print ' unsigned __call = Trace::BeginEnter(__%s_sig);' % (function.name,)
+ print ' unsigned __call = __writer.beginEnter(&__%s_sig);' % (function.name,)
for arg in function.args:
assert not arg.output
- print ' Trace::BeginArg(%u);' % (arg.index,)
+ print ' __writer.beginArg(%u);' % (arg.index,)
if arg.name != 'pointer':
dump_instance(arg.type, arg.name)
else:
- print ' Trace::LiteralBlob((const void *)%s, __size);' % (arg.name)
- print ' Trace::EndArg();'
+ print ' __writer.writeBlob((const void *)%s, __size);' % (arg.name)
+ print ' __writer.endArg();'
- print ' Trace::EndEnter();'
- print ' Trace::BeginLeave(__call);'
- print ' Trace::EndLeave();'
+ print ' __writer.endEnter();'
+ print ' __writer.beginLeave(__call);'
+ print ' __writer.endLeave();'
print ' }'
print ' }'
self.array_epilog(api, uppercase_name)
print ' size_t __size = __%s_size(%s, maxindex);' % (function.name, arg_names)
# Emit a fake function
- print ' unsigned __call = Trace::BeginEnter(__%s_sig);' % (function.name,)
+ print ' unsigned __call = __writer.beginEnter(&__%s_sig);' % (function.name,)
for arg in function.args:
assert not arg.output
- print ' Trace::BeginArg(%u);' % (arg.index,)
+ print ' __writer.beginArg(%u);' % (arg.index,)
if arg.name != 'pointer':
dump_instance(arg.type, arg.name)
else:
- print ' Trace::LiteralBlob((const void *)%s, __size);' % (arg.name)
- print ' Trace::EndArg();'
+ print ' __writer.writeBlob((const void *)%s, __size);' % (arg.name)
+ print ' __writer.endArg();'
- print ' Trace::EndEnter();'
- print ' Trace::BeginLeave(__call);'
- print ' Trace::EndLeave();'
+ print ' __writer.endEnter();'
+ print ' __writer.beginLeave(__call);'
+ print ' __writer.endLeave();'
print ' }'
print ' }'
print ' }'
self.fake_call(function, [texture])
def fake_call(self, function, args):
- print ' unsigned __fake_call = Trace::BeginEnter(__%s_sig);' % (function.name,)
+ print ' unsigned __fake_call = __writer.beginEnter(&__%s_sig);' % (function.name,)
for arg, instance in zip(function.args, args):
assert not arg.output
- print ' Trace::BeginArg(%u);' % (arg.index,)
+ print ' __writer.beginArg(%u);' % (arg.index,)
dump_instance(arg.type, instance)
- print ' Trace::EndArg();'
- print ' Trace::EndEnter();'
- print ' Trace::BeginLeave(__fake_call);'
- print ' Trace::EndLeave();'
+ print ' __writer.endArg();'
+ print ' __writer.endEnter();'
+ print ' __writer.beginLeave(__fake_call);'
+ print ' __writer.endLeave();'
projects / apitrace / blobdiff