import specs.glapi as glapi
import specs.glparams as glparams
from specs.glxapi import glxapi
-from trace import Tracer, dump_instance
+from trace import Tracer
class TypeGetter(stdapi.Visitor):
self.long_suffix = long_suffix
self.ext_suffix = ext_suffix
- def visit_const(self, const):
+ def visitConst(self, const):
return self.visit(const.type)
- def visit_alias(self, alias):
+ def visitAlias(self, alias):
if alias.expr == 'GLboolean':
if self.long_suffix:
suffix = 'Booleanv'
function_name = self.prefix + suffix + self.ext_suffix
return function_name, arg_type
- def visit_enum(self, enum):
+ def visitEnum(self, enum):
return self.visit(glapi.GLint)
- def visit_bitmask(self, bitmask):
+ def visitBitmask(self, bitmask):
return self.visit(glapi.GLint)
- def visit_opaque(self, pointer):
+ def visitOpaque(self, pointer):
return self.prefix + 'Pointerv' + self.ext_suffix, 'GLvoid *'
'GL_T4F_C4F_N3F_V4F',
]
- def trace_function_impl_body(self, function):
+ def traceFunctionImplBody(self, function):
# Defer tracing of user array pointers...
if function.name in self.array_pointer_function_names:
print ' GLint __array_buffer = 0;'
print ' ctx->user_arrays_arb = true;'
if function.name == "glVertexAttribPointerNV":
print ' ctx->user_arrays_nv = true;'
- self.dispatch_function(function)
+ self.invokeFunction(function)
# And also break down glInterleavedArrays into the individual calls
if function.name == 'glInterleavedArrays':
print ' static const trace::FunctionSig &__sig = %s ? __glEnableClientState_sig : __glDisableClientState_sig;' % flag_name
print ' unsigned __call = trace::localWriter.beginEnter(&__sig);'
print ' trace::localWriter.beginArg(0);'
- dump_instance(glapi.GLenum, enable_name)
+ self.serializeValue(glapi.GLenum, enable_name)
print ' trace::localWriter.endArg();'
print ' trace::localWriter.endEnter();'
print ' trace::localWriter.beginLeave(__call);'
print ' }'
# Emit a fake memcpy on buffer uploads
- if function.name in ('glUnmapBuffer', 'glUnmapBufferARB', ):
+ if function.name in ('glUnmapBuffer', 'glUnmapBufferARB', 'glUnmapBufferOES'):
print ' struct buffer_mapping *mapping = get_buffer_mapping(target);'
print ' if (mapping && mapping->write && !mapping->explicit_flush) {'
self.emit_memcpy('mapping->map', 'mapping->map', 'mapping->length')
print ' }'
+ if function.name == 'glUnmapNamedBufferEXT':
+ print ' GLint access = 0;'
+ print ' glGetNamedBufferParameterivEXT(buffer, GL_BUFFER_ACCESS, &access);'
+ print ' if ((access & GL_MAP_WRITE_BIT) & !(access & GL_MAP_FLUSH_EXPLICIT_BIT)) {'
+ print ' GLvoid *map = NULL;'
+ print ' glGetNamedBufferPointervEXT(buffer, GL_BUFFER_MAP_POINTER, &map);'
+ print ' GLint length = 0;'
+ print ' glGetNamedBufferParameterivEXT(buffer, GL_BUFFER_MAP_LENGTH, &length);'
+ self.emit_memcpy('map', 'map', 'length')
+ print ' }'
if function.name in ('glFlushMappedBufferRange', 'glFlushMappedBufferRangeAPPLE'):
print ' struct buffer_mapping *mapping = get_buffer_mapping(target);'
print ' if (mapping) {'
print ' //assert(offset + length <= mapping->length);'
self.emit_memcpy('(char *)mapping->map + offset', '(const char *)mapping->map + offset', 'length')
print ' }'
- # FIXME: glFlushMappedNamedBufferRangeEXT
+ if function.name == 'glFlushMappedNamedBufferRangeEXT':
+ print ' GLvoid *map = NULL;'
+ print ' glGetNamedBufferPointervEXT(buffer, GL_BUFFER_MAP_POINTER, &map);'
+ print ' if (map) {'
+ self.emit_memcpy('(char *)map + offset', '(const char *)map + offset', 'length')
+ print ' }'
# Don't leave vertex attrib locations to chance. Instead emit fake
# glBindAttribLocation calls to ensure that the same locations will be
# 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)
+ Tracer.invokeFunction(self, function)
print ' GLint active_attributes = 0;'
print ' __glGetProgramiv(program, GL_ACTIVE_ATTRIBUTES, &active_attributes);'
print ' for (GLint attrib = 0; attrib < active_attributes; ++attrib) {'
print ' }'
print ' }'
if function.name == 'glLinkProgramARB':
- Tracer.dispatch_function(self, function)
+ Tracer.invokeFunction(self, function)
print ' GLint active_attributes = 0;'
print ' __glGetObjectParameterivARB(programObj, GL_OBJECT_ACTIVE_ATTRIBUTES_ARB, &active_attributes);'
print ' for (GLint attrib = 0; attrib < active_attributes; ++attrib) {'
print ' }'
print ' }'
- Tracer.trace_function_impl_body(self, function)
+ Tracer.traceFunctionImplBody(self, function)
gremedy_functions = [
'glStringMarkerGREMEDY',
'glFrameTerminatorGREMEDY',
]
- def dispatch_function(self, function):
+ def invokeFunction(self, function):
if function.name in ('glLinkProgram', 'glLinkProgramARB'):
# These functions have been dispatched already
return
print ' }'
if_ = 'else if'
print ' else {'
- Tracer.dispatch_function(self, function)
+ Tracer.invokeFunction(self, function)
print ' }'
return
# Override GL extensions
if function.name in ('glGetString', 'glGetIntegerv', 'glGetStringi'):
- Tracer.dispatch_function(self, function, prefix = 'gltrace::__', suffix = '_override')
+ Tracer.invokeFunction(self, function, prefix = 'gltrace::__', suffix = '_override')
return
- Tracer.dispatch_function(self, function)
-
- def emit_memcpy(self, dest, src, length):
- print ' unsigned __call = trace::localWriter.beginEnter(&trace::memcpy_sig);'
- print ' trace::localWriter.beginArg(0);'
- print ' trace::localWriter.writeOpaque(%s);' % dest
- print ' trace::localWriter.endArg();'
- print ' trace::localWriter.beginArg(1);'
- print ' trace::localWriter.writeBlob(%s, %s);' % (src, length)
- print ' trace::localWriter.endArg();'
- print ' trace::localWriter.beginArg(2);'
- print ' trace::localWriter.writeUInt(%s);' % length
- print ' trace::localWriter.endArg();'
- print ' trace::localWriter.endEnter();'
- print ' trace::localWriter.beginLeave(__call);'
- print ' trace::localWriter.endLeave();'
-
+ Tracer.invokeFunction(self, function)
+
buffer_targets = [
'ARRAY_BUFFER',
'ELEMENT_ARRAY_BUFFER',
'ATOMIC_COUNTER_BUFFER',
]
- def wrap_ret(self, function, instance):
- Tracer.wrap_ret(self, function, instance)
+ def wrapRet(self, function, instance):
+ Tracer.wrapRet(self, function, instance)
- if function.name in ('glMapBuffer', 'glMapBufferARB'):
+ if function.name in ('glMapBuffer', 'glMapBufferARB', 'glMapBufferOES'):
print ' struct buffer_mapping *mapping = get_buffer_mapping(target);'
print ' if (mapping) {'
print ' mapping->map = %s;' % (instance)
'glTextureSubImage3DEXT',
])
- def dump_arg_instance(self, function, arg):
+ def serializeArgValue(self, function, arg):
if function.name in self.draw_function_names and arg.name == 'indices':
print ' GLint __element_array_buffer = 0;'
print ' __glGetIntegerv(GL_ELEMENT_ARRAY_BUFFER_BINDING, &__element_array_buffer);'
else:
print ' trace::localWriter.writeBlob(%s, count*__gl_type_size(type));' % (arg.name)
print ' } else {'
- Tracer.dump_arg_instance(self, function, arg)
+ Tracer.serializeArgValue(self, function, arg)
print ' }'
return
print ' if (__unpack_buffer) {'
print ' trace::localWriter.writeOpaque(%s);' % arg.name
print ' } else {'
- Tracer.dump_arg_instance(self, function, arg)
+ Tracer.serializeArgValue(self, function, arg)
print ' }'
print ' }'
return
assert function.args[arg.index - 1].name == 'pname'
assert function.args[arg.index - 1].type == glapi.GLenum
print ' if (is_symbolic_pname(pname) && is_symbolic_param(%s)) {' % arg.name
- dump_instance(glapi.GLenum, arg.name)
+ self.serializeValue(glapi.GLenum, arg.name)
print ' } else {'
- Tracer.dump_arg_instance(self, function, arg)
+ Tracer.serializeArgValue(self, function, arg)
print ' }'
return
- Tracer.dump_arg_instance(self, function, arg)
+ Tracer.serializeArgValue(self, function, arg)
def footer(self, api):
Tracer.footer(self, api)
assert not arg.output
print ' trace::localWriter.beginArg(%u);' % (arg.index,)
if arg.name != 'pointer':
- dump_instance(arg.type, arg.name)
+ self.serializeValue(arg.type, arg.name)
else:
print ' trace::localWriter.writeBlob((const void *)%s, __size);' % (arg.name)
print ' trace::localWriter.endArg();'
assert not arg.output
print ' trace::localWriter.beginArg(%u);' % (arg.index,)
if arg.name != 'pointer':
- dump_instance(arg.type, arg.name)
+ self.serializeValue(arg.type, arg.name)
else:
print ' trace::localWriter.writeBlob((const void *)%s, __size);' % (arg.name)
print ' trace::localWriter.endArg();'
for arg, instance in zip(function.args, args):
assert not arg.output
print ' trace::localWriter.beginArg(%u);' % (arg.index,)
- dump_instance(arg.type, instance)
+ self.serializeValue(arg.type, instance)
print ' trace::localWriter.endArg();'
print ' trace::localWriter.endEnter();'
print ' trace::localWriter.beginLeave(__fake_call);'