Give CLI command names a _command prefix

[apitrace] / d3dshader.cpp

diff --git a/d3dshader.cpp b/d3dshader.cpp
index 97f5d424299c042b7cf43aaf6ba63ef0cddf5342..a2d5c1293c275fce04958e90d0258851358ca12c 100644 (file)
--- a/d3dshader.cpp
+++ b/d3dshader.cpp
@@ -27,9 +27,8 @@
 
 #include <stdio.h>
 
-#include "trace_writer.hpp"
-#include "d3d9imports.hpp"
 #include "d3dshader.hpp"
+#include "d3d9imports.hpp"
 
 
 typedef HRESULT
@@ -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);
 }