More renaming.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1696 8ced0084-cf51-0410-be5f-012b33b47a6e

16 files changed, 18 insertions, 18 deletions

diff --git a/Source/Core/VideoCommon/Src/PixelShader.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index dfac501beb..d409d1bacc 100644
--- a/Source/Core/VideoCommon/Src/PixelShader.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -20,7 +20,7 @@
 #include <assert.h>
 
 #include "Profiler.h"
-#include "PixelShader.h"
+#include "PixelShaderGen.h"
 #include "XFMemory.h"  // for texture projection mode
 #include "BPMemory.h"
 
diff --git a/Source/Core/VideoCommon/Src/PixelShader.h b/Source/Core/VideoCommon/Src/PixelShaderGen.h
index df54a7b0a4..df54a7b0a4 100644
--- a/Source/Core/VideoCommon/Src/PixelShader.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.h
diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.h b/Source/Core/VideoCommon/Src/PixelShaderManager.h
index a68b8c6e80..4a8a597e03 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.h
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.h
@@ -19,7 +19,7 @@
 #define _PIXELSHADERMANAGER_H
 
 #include "BPMemory.h"
-#include "PixelShader.h"
+#include "PixelShaderGen.h"
 
 void SetPSConstant4f(int const_number, float f1, float f2, float f3, float f4);
 void SetPSConstant4fv(int const_number, const float *f);
diff --git a/Source/Core/VideoCommon/Src/SConscript b/Source/Core/VideoCommon/Src/SConscript
index bdeb779542..f7274bedd4 100644
--- a/Source/Core/VideoCommon/Src/SConscript
+++ b/Source/Core/VideoCommon/Src/SConscript
@@ -11,9 +11,9 @@ files = [
 	'TextureDecoder.cpp',
 	'XFMemory.cpp',
 	'XFBConvert.cpp',
-	'PixelShader.cpp',
+	'PixelShaderGen.cpp',
 	'PixelShaderManager.cpp',
-	'VertexShader.cpp',
+	'VertexShaderGen.cpp',
 	'VertexShaderManager.cpp',
 	'VertexLoader.cpp',
 	'VertexLoader_Color.cpp',
diff --git a/Source/Core/VideoCommon/Src/VertexShader.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index af6cb73f8a..a3fdfc13f0 100644
--- a/Source/Core/VideoCommon/Src/VertexShader.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -21,7 +21,7 @@
 #include "NativeVertexFormat.h"
 
 #include "BPMemory.h"
-#include "VertexShader.h"
+#include "VertexShaderGen.h"
 
 // Mash together all the inputs that contribute to the code of a generated vertex shader into
 // a unique identifier, basically containing all the bits. Yup, it's a lot ....
diff --git a/Source/Core/VideoCommon/Src/VertexShader.h b/Source/Core/VideoCommon/Src/VertexShaderGen.h
index 8518f299dd..8518f299dd 100644
--- a/Source/Core/VideoCommon/Src/VertexShader.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.h
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
index 48e9128298..51c373f93c 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.cpp
@@ -22,7 +22,7 @@
 
 #include "Statistics.h"
 
-#include "VertexShader.h"
+#include "VertexShaderGen.h"
 #include "VertexShaderManager.h"
 #include "BPMemory.h"
 #include "CPMemory.h"
diff --git a/Source/Core/VideoCommon/Src/VertexShaderManager.h b/Source/Core/VideoCommon/Src/VertexShaderManager.h
index 10d308a66d..06f8a1a168 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderManager.h
+++ b/Source/Core/VideoCommon/Src/VertexShaderManager.h
@@ -18,7 +18,7 @@
 #ifndef _VERTEXSHADERMANAGER_H
 #define _VERTEXSHADERMANAGER_H
 
-#include "VertexShader.h"
+#include "VertexShaderGen.h"
 
 // The non-API dependent parts.
 class VertexShaderManager
diff --git a/Source/Core/VideoCommon/VideoCommon.vcproj b/Source/Core/VideoCommon/VideoCommon.vcproj
index 95dc4965d0..0bfdf3da81 100644
--- a/Source/Core/VideoCommon/VideoCommon.vcproj
+++ b/Source/Core/VideoCommon/VideoCommon.vcproj
@@ -415,19 +415,19 @@
 			Name="ShaderGenerators"

 			>

 			<File

-				RelativePath=".\Src\PixelShader.cpp"

+				RelativePath=".\Src\PixelShaderGen.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\PixelShader.h"

+				RelativePath=".\Src\PixelShaderGen.h"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\VertexShader.cpp"

+				RelativePath=".\Src\VertexShaderGen.cpp"

 				>

 			</File>

 			<File

-				RelativePath=".\Src\VertexShader.h"

+				RelativePath=".\Src\VertexShaderGen.h"

 				>

 			</File>

 		</Filter>

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
index 049608c381..e1b10b298c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/NativeVertexFormat.cpp
@@ -20,7 +20,7 @@
 #include "x64Emitter.h"
 #include "ABI.h"
 #include "MemoryUtil.h"
-#include "VertexShader.h"
+#include "VertexShaderGen.h"
 
 #include "CPMemory.h"
 #include "NativeVertexFormat.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index 85daf87307..0035a5c54d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -30,7 +30,7 @@
 #include "ImageWrite.h"

 #include "Common.h"

 #include "Render.h"

-#include "VertexShader.h"

+#include "VertexShaderGen.h"

 #include "PixelShaderCache.h"

 #include "PixelShaderManager.h"

 

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
index a2c3ef85c0..5d0ebb37aa 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.h
@@ -19,7 +19,7 @@
 #include <string>

 

 #include "BPMemory.h"

-#include "PixelShader.h"

+#include "PixelShaderGen.h"

 

 struct FRAGMENTSHADER

 {

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
index b5fa483612..cce9d2fe33 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/Render.cpp
@@ -37,7 +37,7 @@
 #include "BPStructs.h"
 #include "TextureMngr.h"
 #include "rasterfont.h"
-#include "VertexShader.h"
+#include "VertexShaderGen.h"
 #include "PixelShaderCache.h"
 #include "PixelShaderManager.h"
 #include "VertexLoaderManager.h"
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
index 49cfe383e9..b2e57e1f4c 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexManager.cpp
@@ -15,7 +15,7 @@
 #include "PixelShaderManager.h"
 #include "VertexShaderCache.h"
 #include "VertexShaderManager.h"
-#include "VertexShader.h"
+#include "VertexShaderGen.h"
 #include "VertexLoader.h"
 #include "VertexManager.h"
 
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index dbd163beae..9c0313aa54 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -28,7 +28,7 @@
 #include <Cg/cgGL.h>

 

 #include "Render.h"

-#include "VertexShader.h"

+#include "VertexShaderGen.h"

 #include "VertexShaderManager.h"

 #include "VertexShaderCache.h"

 #include "VertexManager.h"

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
index eb93a3d543..32a28f6b68 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.h
@@ -19,7 +19,7 @@
 #include <string>

 

 #include "BPMemory.h"

-#include "VertexShader.h"

+#include "VertexShaderGen.h"

 

 struct VERTEXSHADER

 {