Rename d3dshader.* -> d3d9shader.*

apitrace · May 13, 2012 · 41a6d89 · 41a6d89
1 parent a27e272
commit 41a6d89
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 8 deletions.
diff --git a/common/json.hpp → retrace/json.hpp b/common/json.hpp → retrace/json.hpp
diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
@@ -64,7 +64,7 @@ if (WIN32)
                 ${CMAKE_SOURCE_DIR}/specs/winapi.py
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
         )
-        add_library (d3d8trace MODULE d3d8.def d3d8trace.cpp d3dshader.cpp)
+        add_library (d3d8trace MODULE d3d8.def d3d8trace.cpp d3d9shader.cpp)
         target_link_libraries (d3d8trace
             common
             ${ZLIB_LIBRARIES}
@@ -94,7 +94,7 @@ if (WIN32)
                 ${CMAKE_SOURCE_DIR}/specs/winapi.py
                 ${CMAKE_SOURCE_DIR}/specs/stdapi.py
         )
-        add_library (d3d9trace MODULE d3d9.def d3d9trace.cpp d3dshader.cpp)
+        add_library (d3d9trace MODULE d3d9.def d3d9trace.cpp d3d9shader.cpp)
         target_link_libraries (d3d9trace
             common
             ${ZLIB_LIBRARIES}

diff --git a/wrappers/d3d8trace.py b/wrappers/d3d8trace.py
@@ -44,7 +44,7 @@ def serializeArgValue(self, function, arg):
     print
     print '#include <windows.h>'
     print '#include <d3d8.h>'
-    print '#include "d3dshader.hpp"'
+    print '#include "d3d9shader.hpp"'
     print
     print '#include "trace_writer_local.hpp"'
     print '#include "os.hpp"'

diff --git a/wrappers/d3dshader.cpp → wrappers/d3d9shader.cpp b/wrappers/d3dshader.cpp → wrappers/d3d9shader.cpp
@@ -27,7 +27,7 @@
 
 #include <stdio.h>
 
-#include "d3dshader.hpp"
+#include "d3d9shader.hpp"
 #include "d3d9imports.hpp"
 #include "d3dsize.hpp"
 

diff --git a/wrappers/d3dshader.hpp → wrappers/d3d9shader.hpp b/wrappers/d3dshader.hpp → wrappers/d3d9shader.hpp
@@ -24,8 +24,8 @@
  *
  **************************************************************************/
 
-#ifndef _D3DSHADER_HPP_
-#define _D3DSHADER_HPP_
+#ifndef _D3D9SHADER_HPP_
+#define _D3D9SHADER_HPP_
 
 
 #include <windows.h>
@@ -35,4 +35,4 @@
 void DumpShader(trace::Writer &writer, const DWORD *tokens);
 
 
-#endif /* _D3DSHADER_HPP_ */
+#endif /* _D3D9SHADER_HPP_ */
diff --git a/wrappers/d3d9trace.py b/wrappers/d3d9trace.py
@@ -77,7 +77,7 @@ def implementWrapperInterfaceMethodBody(self, interface, base, method):
     print
     print '#include "d3d9imports.hpp"'
     print '#include "d3dsize.hpp"'
-    print '#include "d3dshader.hpp"'
+    print '#include "d3d9shader.hpp"'
     print
     print '''
 static inline size_t