d2d1,dwrite: Trace both APIs together.

[apitrace] / wrappers / d3d11trace.py

diff --git a/wrappers/d3d11trace.py b/wrappers/d3d11trace.py
index 12eec869404f858a0f9780220e478cdb1bbf3a76..6e2627717dca96b84ffb32b5fad394d95a333f61 100644 (file)
--- a/wrappers/d3d11trace.py
+++ b/wrappers/d3d11trace.py
@@ -24,7 +24,10 @@
 ##########################################################################/
 
 
-from dlltrace import DllTracer
+import sys
+
+from d3dcommontrace import D3DCommonTracer
+from specs.stdapi import API
 from specs.d3d11 import d3d11
 
 
@@ -34,13 +37,19 @@ if __name__ == '__main__':
     print '#include "trace_writer_local.hpp"'
     print '#include "os.hpp"'
     print
-    print '#include <windows.h>'
-    print '#include <tchar.h>'
-    print
-    print '#include "compat.h"'
+    print '#include "d3d11imports.hpp"'
     print
-    print '#include <d3d11.h>'
-    print '#include <d3dx11.h>'
+
+    if int(sys.argv[1]):
+        import specs.d3d11_1
+        print '#include <d3d11_1.h>'
+        print
+
+    print '#include "d3dcommonshader.hpp"'
+    print '#include "d3d11size.hpp"'
     print
-    tracer = DllTracer('d3d11.dll')
-    tracer.traceApi(d3d11)
+
+    api = API()
+    api.addModule(d3d11)
+    tracer = D3DCommonTracer()
+    tracer.traceApi(api)