Merge branch 'master' into dxva

[apitrace] / wrappers / d3d10trace.py

diff --git a/wrappers/d3d10trace.py b/wrappers/d3d10trace.py
index d43f042b08f2a8e6efa1328f045b524f24cc88ac..adb5dae207c94a0d6eef6554b67585ae0f6eee29 100644 (file)
--- a/wrappers/d3d10trace.py
+++ b/wrappers/d3d10trace.py
@@ -24,21 +24,10 @@
 ##########################################################################/
 
 
-from dlltrace import DllTracer
-from specs import stdapi
+from d3dcommontrace import D3DCommonTracer
 from specs.d3d10misc import d3d10
 
 
-class D3D10Tracer(DllTracer):
-
-    def serializeArgValue(self, function, arg):
-        # Dump shaders as strings
-        if isinstance(arg.type, stdapi.Blob) and arg.name.startswith('pShaderBytecode'):
-            print '    DumpShader(trace::localWriter, %s, %s);' % (arg.name, arg.type.size)
-            return
-
-        DllTracer.serializeArgValue(self, function, arg)
-
 if __name__ == '__main__':
     print '#define INITGUID'
     print
@@ -47,6 +36,7 @@ if __name__ == '__main__':
     print
     print '#include "d3d10imports.hpp"'
     print '#include "d3d10shader.hpp"'
+    print '#include "d3d10size.hpp"'
     print
-    tracer = D3D10Tracer('d3d10.dll')
+    tracer = D3DCommonTracer('d3d10.dll')
     tracer.traceApi(d3d10)