From 41a6d89aa0156103f5217521fe582941782aad8e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Fonseca?= <jose.r.fonseca@gmail.com>
Date: Sun, 13 May 2012 11:41:08 +0100
Subject: [PATCH] Rename d3dshader.* -> d3d9shader.*

---
 {common => retrace}/json.hpp               | 0
 wrappers/CMakeLists.txt                    | 4 ++--
 wrappers/d3d8trace.py                      | 2 +-
 wrappers/{d3dshader.cpp => d3d9shader.cpp} | 2 +-
 wrappers/{d3dshader.hpp => d3d9shader.hpp} | 6 +++---
 wrappers/d3d9trace.py                      | 2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename {common => retrace}/json.hpp (100%)
 rename wrappers/{d3dshader.cpp => d3d9shader.cpp} (99%)
 rename wrappers/{d3dshader.hpp => d3d9shader.hpp} (94%)

diff --git a/common/json.hpp b/retrace/json.hpp
similarity index 100%
rename from common/json.hpp
rename to retrace/json.hpp
diff --git a/wrappers/CMakeLists.txt b/wrappers/CMakeLists.txt
index af9d913..5e61ed3 100644
--- 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
index 5219094..0bf4bb8 100644
--- a/wrappers/d3d8trace.py
+++ b/wrappers/d3d8trace.py
@@ -44,7 +44,7 @@ if __name__ == '__main__':
     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 b/wrappers/d3d9shader.cpp
similarity index 99%
rename from wrappers/d3dshader.cpp
rename to wrappers/d3d9shader.cpp
index b0690dc..f44cad3 100644
--- a/wrappers/d3dshader.cpp
+++ b/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 b/wrappers/d3d9shader.hpp
similarity index 94%
rename from wrappers/d3dshader.hpp
rename to wrappers/d3d9shader.hpp
index 485df05..340f03b 100644
--- a/wrappers/d3dshader.hpp
+++ b/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
index 8d71a3c..6ee059f 100644
--- a/wrappers/d3d9trace.py
+++ b/wrappers/d3d9trace.py
@@ -77,7 +77,7 @@ if __name__ == '__main__':
     print
     print '#include "d3d9imports.hpp"'
     print '#include "d3dsize.hpp"'
-    print '#include "d3dshader.hpp"'
+    print '#include "d3d9shader.hpp"'
     print
     print '''
 static inline size_t
-- 
2.43.0