X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=d3dshader.cpp;h=d3101d0103de7c81592e50a3a46782cdd28e7820;hb=3176ebeffe825a5f998b13755c09cfa312b0e8d3;hp=799b35f9b07d6881677043d5648096e5f32fab7e;hpb=1e5d421e42e2605939cfdb86e4479f7a1b0be8d8;p=apitrace

diff --git a/d3dshader.cpp b/d3dshader.cpp
index 799b35f..d3101d0 100644
--- a/d3dshader.cpp
+++ b/d3dshader.cpp
@@ -27,9 +27,8 @@
 
 #include <stdio.h>
 
-#include "trace_write.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);
 }