X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=retrace%2Fretrace.py;h=1cdb092efcfc7b9f3d0610e3a8e0ef2abaa1b2bc;hb=52398312caaba3e1bc0613016d5bf3507d1e242a;hp=1e39d42a19346d9f3b6be8f226a6c44bc88a8158;hpb=bb23f3a0bad625e3c427b9de991d4a42fa22e5f0;p=apitrace diff --git a/retrace/retrace.py b/retrace/retrace.py index 1e39d42..1cdb092 100644 --- a/retrace/retrace.py +++ b/retrace/retrace.py @@ -40,12 +40,15 @@ class UnsupportedType(Exception): pass -def lookupHandle(handle, value): +def lookupHandle(handle, value, lval=False): if handle.key is None: return "_%s_map[%s]" % (handle.name, value) else: key_name, key_type = handle.key - return "_%s_map[%s][%s]" % (handle.name, key_name, value) + if handle.name == "location" and lval == False: + return "_location_map[%s].lookupUniformLocation(%s)" % (key_name, value) + else: + return "_%s_map[%s][%s]" % (handle.name, key_name, value) class ValueAllocator(stdapi.Visitor): @@ -66,10 +69,10 @@ class ValueAllocator(stdapi.Visitor): pass def visitArray(self, array, lvalue, rvalue): - print ' %s = _allocator.alloc<%s>(&%s);' % (lvalue, array.type, rvalue) + print ' %s = static_cast<%s *>(_allocator.alloc(&%s, sizeof *%s));' % (lvalue, array.type, rvalue, lvalue) def visitPointer(self, pointer, lvalue, rvalue): - print ' %s = _allocator.alloc<%s>(&%s);' % (lvalue, pointer.type, rvalue) + print ' %s = static_cast<%s *>(_allocator.alloc(&%s, sizeof *%s));' % (lvalue, pointer.type, rvalue, lvalue) def visitIntPointer(self, pointer, lvalue, rvalue): pass @@ -126,7 +129,7 @@ class ValueDeserializer(stdapi.Visitor, stdapi.ExpanderMixin): self.seq += 1 print ' if (%s) {' % (lvalue,) - print ' const trace::Array *%s = dynamic_cast(&%s);' % (tmp, rvalue) + print ' const trace::Array *%s = (%s).toArray();' % (tmp, rvalue) length = '%s->values.size()' % (tmp,) index = '_j' + array.tag print ' for (size_t {i} = 0; {i} < {length}; ++{i}) {{'.format(i = index, length = length) @@ -141,7 +144,7 @@ class ValueDeserializer(stdapi.Visitor, stdapi.ExpanderMixin): self.seq += 1 print ' if (%s) {' % (lvalue,) - print ' const trace::Array *%s = dynamic_cast(&%s);' % (tmp, rvalue) + print ' const trace::Array *%s = (%s).toArray();' % (tmp, rvalue) try: self.visit(pointer.type, '%s[0]' % (lvalue,), '*%s->values[0]' % (tmp,)) finally: @@ -166,7 +169,14 @@ class ValueDeserializer(stdapi.Visitor, stdapi.ExpanderMixin): print ' if (retrace::verbosity >= 2) {' print ' std::cout << "%s " << size_t(%s) << " <- " << size_t(%s) << "\\n";' % (handle.name, lvalue, new_lvalue) print ' }' - print ' %s = %s;' % (lvalue, new_lvalue) + if (new_lvalue.startswith('_program_map') or new_lvalue.startswith('_shader_map')): + print 'if (glretrace::supportsARBShaderObjects) {' + print ' %s = _handleARB_map[%s];' % (lvalue, lvalue) + print '} else {' + print ' %s = %s;' % (lvalue, new_lvalue) + print '}' + else: + print ' %s = %s;' % (lvalue, new_lvalue) def visitBlob(self, blob, lvalue, rvalue): print ' %s = static_cast<%s>((%s).toPointer());' % (lvalue, blob, rvalue) @@ -180,7 +190,7 @@ class ValueDeserializer(stdapi.Visitor, stdapi.ExpanderMixin): tmp = '_s_' + struct.tag + '_' + str(self.seq) self.seq += 1 - print ' const trace::Struct *%s = dynamic_cast(&%s);' % (tmp, rvalue) + print ' const trace::Struct *%s = (%s).toStruct();' % (tmp, rvalue) print ' assert(%s);' % (tmp) for i in range(len(struct.members)): member = struct.members[i] @@ -241,7 +251,7 @@ class SwizzledValueRegistrator(stdapi.Visitor, stdapi.ExpanderMixin): pass def visitArray(self, array, lvalue, rvalue): - print ' const trace::Array *_a%s = dynamic_cast(&%s);' % (array.tag, rvalue) + print ' const trace::Array *_a%s = (%s).toArray();' % (array.tag, rvalue) print ' if (_a%s) {' % (array.tag) length = '_a%s->values.size()' % array.tag index = '_j' + array.tag @@ -253,7 +263,7 @@ class SwizzledValueRegistrator(stdapi.Visitor, stdapi.ExpanderMixin): print ' }' def visitPointer(self, pointer, lvalue, rvalue): - print ' const trace::Array *_a%s = dynamic_cast(&%s);' % (pointer.tag, rvalue) + print ' const trace::Array *_a%s = (%s).toArray();' % (pointer.tag, rvalue) print ' if (_a%s) {' % (pointer.tag) try: self.visit(pointer.type, '%s[0]' % (lvalue,), '*_a%s->values[0]' % (pointer.tag,)) @@ -279,8 +289,15 @@ class SwizzledValueRegistrator(stdapi.Visitor, stdapi.ExpanderMixin): OpaqueValueDeserializer().visit(handle.type, '_origResult', rvalue); if handle.range is None: rvalue = "_origResult" - entry = lookupHandle(handle, rvalue) - print " %s = %s;" % (entry, lvalue) + entry = lookupHandle(handle, rvalue, True) + if (entry.startswith('_program_map') or entry.startswith('_shader_map')): + print 'if (glretrace::supportsARBShaderObjects) {' + print ' _handleARB_map[%s] = %s;' % (rvalue, lvalue) + print '} else {' + print ' %s = %s;' % (entry, lvalue) + print '}' + else: + print " %s = %s;" % (entry, lvalue) print ' if (retrace::verbosity >= 2) {' print ' std::cout << "{handle.name} " << {rvalue} << " -> " << {lvalue} << "\\n";'.format(**locals()) print ' }' @@ -308,7 +325,7 @@ class SwizzledValueRegistrator(stdapi.Visitor, stdapi.ExpanderMixin): tmp = '_s_' + struct.tag + '_' + str(self.seq) self.seq += 1 - print ' const trace::Struct *%s = dynamic_cast(&%s);' % (tmp, rvalue) + print ' const trace::Struct *%s = (%s).toStruct();' % (tmp, rvalue) print ' assert(%s);' % (tmp,) print ' (void)%s;' % (tmp,) for i in range(len(struct.members)): @@ -464,10 +481,9 @@ class Retracer: # On release our reference when we reach Release() == 0 call in the # trace. if method.name == 'Release': - print ' if (call.ret->toUInt()) {' - print ' return;' + print ' if (call.ret->toUInt() == 0) {' + print ' retrace::delObj(call.arg(0));' print ' }' - print ' retrace::delObj(call.arg(0));' arg_names = ", ".join(method.argNames()) if method.type is not stdapi.Void: @@ -480,7 +496,8 @@ class Retracer: def checkResult(self, resultType): if str(resultType) == 'HRESULT': print r' if (FAILED(_result)) {' - print r' retrace::warning(call) << "failed\n";' + print ' static char szMessageBuffer[128];' + print r' retrace::warning(call) << "call returned 0x" << std::hex << _result << std::dec << ": " << (FormatMessageA(FORMAT_MESSAGE_FROM_SYSTEM, NULL, _result, MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), szMessageBuffer, sizeof szMessageBuffer, NULL) ? szMessageBuffer : "???") << "\n";' print r' }' def filterFunction(self, function):