Fix D3D shader dumping after trace writing refactoring.

diff --git a/d3d8.py b/d3d8.py
index 89ad997ab52ee2c5e63af720e24d34f34da1a3b5..f5fb76ea917763c36c5c2ce3f4e9f8fe05b17807 100644 (file)
--- a/d3d8.py
+++ b/d3d8.py
@@ -288,7 +288,7 @@ class D3D8Tracer(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(__writer, %s);' % (arg.name)
             return
 
         DllTracer.dump_arg_instance(self, function, arg)

diff --git a/d3d9.py b/d3d9.py
index 81401627c43385031aad6b3735f07bf7e77f7e48..4a4bd4251c53ce76fe6c8d8c6f7948b98338110f 100644 (file)
--- a/d3d9.py
+++ b/d3d9.py
@@ -455,7 +455,7 @@ 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(__writer, %s);' % (arg.name)
             return
 
         DllTracer.dump_arg_instance(self, function, arg)

diff --git a/d3dshader.cpp b/d3dshader.cpp
index 97f5d424299c042b7cf43aaf6ba63ef0cddf5342..13987f4b0d9cb6de4509a5d13f039c7159f6bc93 100644 (file)
--- a/d3dshader.cpp
+++ b/d3dshader.cpp
@@ -27,7 +27,6 @@
 
 #include <stdio.h>
 
-#include "trace_writer.hpp"
 #include "d3d9imports.hpp"
 #include "d3dshader.hpp"
 
@@ -41,7 +40,7 @@ typedef HRESULT
 );
 
 
-void DumpShader(const DWORD *tokens)
+void DumpShader(Trace::Writer &writer, const DWORD *tokens)
 {
     static BOOL firsttime = TRUE;
     static HMODULE hD3DXModule = NULL;
@@ -81,7 +80,7 @@ found:
 
         hr = pfnD3DXDisassembleShader( (DWORD *)tokens, FALSE, NULL, &pDisassembly);
         if (hr == D3D_OK) {
-            Trace::LiteralString((const char *)pDisassembly->GetBufferPointer());
+            writer.writeString((const char *)pDisassembly->GetBufferPointer());
         }
 
         if (pDisassembly) {
@@ -93,5 +92,5 @@ found:
         }
     }
 
-    Trace::LiteralOpaque(tokens);
+    writer.writeOpaque(tokens);
 }

diff --git a/d3dshader.hpp b/d3dshader.hpp
index fdde4e43da6d78b198a3339d3491ff8ebd5b8a07..64a878b39aa6b567f532a139ec2690ee93530bf7 100644 (file)
--- a/d3dshader.hpp
+++ b/d3dshader.hpp
@@ -30,7 +30,9 @@
 
 #include <windows.h>
 
-void DumpShader(const DWORD *tokens);
+#include "trace_writer.hpp"
+
+void DumpShader(Trace::Writer &writer, const DWORD *tokens);
 
 
 #endif /* _D3DSHADER_HPP_ */