X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=wrappers%2Fd3d10trace.py;h=1de13927c5bf7fe9562f749029da3848af520fea;hb=00611a483a0a531272ba5810b77fb5d293db1723;hp=cc81265afad57069083f2fad845acc0de3f28ad8;hpb=1b6c87507810fe2d72c81fc109110c1ca25ce94f;p=apitrace

diff --git a/wrappers/d3d10trace.py b/wrappers/d3d10trace.py
index cc81265..1de1392 100644
--- a/wrappers/d3d10trace.py
+++ b/wrappers/d3d10trace.py
@@ -24,7 +24,9 @@
 ##########################################################################/
 
 
-from dlltrace import DllTracer
+from d3dcommontrace import D3DCommonTracer
+from specs.stdapi import API
+from specs.dxgi import dxgi
 from specs.d3d10misc import d3d10
 
 
@@ -34,13 +36,13 @@ if __name__ == '__main__':
     print '#include "trace_writer_local.hpp"'
     print '#include "os.hpp"'
     print
-    print '#include <windows.h>'
-    print '#include <tchar.h>'
+    print '#include "d3d10imports.hpp"'
+    print '#include "d3dcommonshader.hpp"'
+    print '#include "d3d10size.hpp"'
     print
-    print '#include "compat.h"'
-    print
-    print '#include <d3d10.h>'
-    print '#include <d3dx10.h>'
-    print
-    tracer = DllTracer('d3d10.dll')
-    tracer.traceApi(d3d10)
+
+    api = API()
+    api.addModule(dxgi)
+    api.addModule(d3d10)
+    tracer = D3DCommonTracer()
+    tracer.traceApi(api)