d2d1,dwrite: Trace both APIs together.

[apitrace] / wrappers / d3d10_1trace.py

diff --git a/wrappers/d3d10_1trace.py b/wrappers/d3d10_1trace.py
index 1a4443b09110d0482660a01b31cd785fb13194fc..94bd743cd6fa567fb44b21882497812a8edb55ec 100644 (file)
--- a/wrappers/d3d10_1trace.py
+++ b/wrappers/d3d10_1trace.py
@@ -24,7 +24,8 @@
 ##########################################################################/
 
 
-from dlltrace import DllTracer
+from d3dcommontrace import D3DCommonTracer
+from specs.stdapi import API
 from specs.d3d10_1 import d3d10_1
 
 
@@ -34,13 +35,12 @@ if __name__ == '__main__':
     print '#include "trace_writer_local.hpp"'
     print '#include "os.hpp"'
     print
-    print '#include <windows.h>'
-    print '#include <tchar.h>'
+    print '#include "d3d10_1imports.hpp"'
+    print '#include "d3dcommonshader.hpp"'
+    print '#include "d3d10size.hpp"'
     print
-    print '#include "compat.h"'
-    print
-    print '#include <d3d10_1.h>'
-    print '#include <d3dx10.h>'
-    print
-    tracer = DllTracer('d3d10_1.dll')
-    tracer.trace_api(d3d10_1)
+
+    api = API()
+    api.addModule(d3d10_1)
+    tracer = D3DCommonTracer()
+    tracer.traceApi(api)