Merge branch 'd2d'

[apitrace] / wrappers / d3d11trace.py

diff --git a/wrappers/d3d11trace.py b/wrappers/d3d11trace.py
index b25276a0386f7acb40df48ada1c25b75db472d96..c504f5e35326fab498f8ed0c86c7a1e14305af7d 100644 (file)
--- a/wrappers/d3d11trace.py
+++ b/wrappers/d3d11trace.py
@@ -26,7 +26,7 @@
 
 import sys
 
-from dlltrace import DllTracer
+from d3dcommontrace import D3DCommonTracer
 from specs.d3d11 import d3d11
 
 
@@ -36,18 +36,16 @@ if __name__ == '__main__':
     print '#include "trace_writer_local.hpp"'
     print '#include "os.hpp"'
     print
-    print '#include <windows.h>'
-    print '#include <tchar.h>'
+    print '#include "d3d11imports.hpp"'
     print
-    print '#include "compat.h"'
-    print
-    print '#include <d3d11.h>'
 
     if int(sys.argv[1]):
         import specs.d3d11_1
         print '#include <d3d11_1.h>'
+        print
 
-    print '#include <d3dx11.h>'
+    print '#include "d3dcommonshader.hpp"'
+    print '#include "d3d11size.hpp"'
     print
-    tracer = DllTracer('d3d11.dll')
+    tracer = D3DCommonTracer('d3d11.dll')
     tracer.traceApi(d3d11)