X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=d3d9.py;h=640d218dc7a8c2b4726d142cd268e6ec92e128ca;hb=2257168033b52be3094efdbd7eadff8eb77a4c4e;hp=2f8f1420fcbb917a8039681e0acf35630cb5fa3a;hpb=1fa566d54487d9c14477fd9aeac44833087b2ded;p=apitrace

diff --git a/d3d9.py b/d3d9.py
index 2f8f142..640d218 100644
--- a/d3d9.py
+++ b/d3d9.py
@@ -442,10 +442,10 @@ d3d9.add_functions([
     StdFunction(HRESULT, "Direct3DCreate9Ex", [(UINT, "SDKVersion"), Out(Pointer(PDIRECT3D9EX), "ppD3D")], fail='D3DERR_NOTAVAILABLE'),
     StdFunction(Int, "D3DPERF_BeginEvent", [(D3DCOLOR, "col"), (LPCWSTR, "wszName")], fail='-1'),
     StdFunction(Int, "D3DPERF_EndEvent", [], fail='-1'),
-    StdFunction(Void, "D3DPERF_SetMarker", [(D3DCOLOR, "col"), (LPCWSTR, "wszName")], fail=''),
-    StdFunction(Void, "D3DPERF_SetRegion", [(D3DCOLOR, "col"), (LPCWSTR, "wszName")], fail=''),
+    StdFunction(Void, "D3DPERF_SetMarker", [(D3DCOLOR, "col"), (LPCWSTR, "wszName")]),
+    StdFunction(Void, "D3DPERF_SetRegion", [(D3DCOLOR, "col"), (LPCWSTR, "wszName")]),
     StdFunction(BOOL, "D3DPERF_QueryRepeatFrame", [], fail='FALSE'),
-    StdFunction(Void, "D3DPERF_SetOptions", [(DWORD, "dwOptions")], fail=''),
+    StdFunction(Void, "D3DPERF_SetOptions", [(DWORD, "dwOptions")]),
     StdFunction(DWORD, "D3DPERF_GetStatus", [], fail='0'),
 ])
 
@@ -455,19 +455,19 @@ class D3D9Tracer(DllTracer):
     def dump_arg_instance(self, function, arg):
         # Dump shaders as strings
         if function.name in ('CreateVertexShader', 'CreatePixelShader') and arg.name == 'pFunction':
-            print '    DumpShader(%s);' % (arg.name)
+            print '    DumpShader(Trace::localWriter, %s);' % (arg.name)
             return
 
         DllTracer.dump_arg_instance(self, function, arg)
 
 
 if __name__ == '__main__':
-    print '#include "d3d9imports.hpp"'
-    print '#include "d3d9shader.hpp"'
-    print
-    print '#include "trace_write.hpp"'
+    print '#include "trace_writer.hpp"'
     print '#include "os.hpp"'
     print
+    print '#include "d3d9imports.hpp"'
+    print '#include "d3dshader.hpp"'
+    print
     tracer = D3D9Tracer('d3d9.dll')
     tracer.trace_api(d3d9)