rename some files

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

Source/Core/VideoCommon/Src/PixelShader.cpp

@@ -364,7 +364,7 @@ static void BuildSwapModeTable()
     }
 }
 
-char *GeneratePixelShader(u32 texture_mask, bool has_zbuffer_target, bool bRenderZToCol0)
+const char *GeneratePixelShader(u32 texture_mask, bool has_zbuffer_target, bool bRenderZToCol0)
 {
 	text[sizeof(text) - 1] = 0x7C;  // canary
     DVSTARTPROFILE();

Source/Core/VideoCommon/Src/PixelShader.h

@@ -89,7 +89,7 @@ public:
 	}
 };
 
-char *GeneratePixelShader(u32 texture_mask, bool has_zbuffer_target, bool bRenderZToCol0);
+const char *GeneratePixelShader(u32 texture_mask, bool has_zbuffer_target, bool bRenderZToCol0);
 void GetPixelShaderId(PIXELSHADERUID &, u32 s_texturemask, u32 zbufrender, u32 zBufRenderToCol0);
 
 #endif

Source/Core/VideoCommon/Src/VertexShader.cpp

@@ -77,7 +77,7 @@ static char text[16384];
 
 char *GenerateLightShader(char* p, int index, const LitChannel& chan, const char* dest, int coloralpha);
 
-char *GenerateVertexShader(u32 components, bool has_zbuffer_target)
+const char *GenerateVertexShader(u32 components, bool has_zbuffer_target)
 {
 	text[sizeof(text) - 1] = 0x7C;  // canary
     DVSTARTPROFILE();

Source/Core/VideoCommon/Src/VertexShader.h

@@ -94,7 +94,7 @@ public:
 	}
 };
 
-char *GenerateVertexShader(u32 components, bool has_zbuffer_target);
+const char *GenerateVertexShader(u32 components, bool has_zbuffer_target);
 void GetVertexShaderId(VERTEXSHADERUID& vid, u32 components, u32 zbufrender);
 
 #endif

Source/Plugins/Plugin_VideoDX9/Plugin_VideoDX9.vcproj

@@ -1205,6 +1205,14 @@
 				RelativePath=".\Src\NativeVertexFormat.cpp"
 				>
 			</File>
+			<File
+				RelativePath=".\Src\TransformEngine.cpp"
+				>
+			</File>
+			<File
+				RelativePath=".\Src\TransformEngine.h"
+				>
+			</File>
 			<File
 				RelativePath=".\Src\VertexLoader.cpp"
 				>
@@ -1270,11 +1278,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\Src\PixelShaderManager.cpp"
+				RelativePath=".\Src\PixelShaderCache.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Src\PixelShaderManager.h"
+				RelativePath=".\Src\PixelShaderCache.h"
 				>
 			</File>
 			<File
@@ -1293,18 +1301,6 @@
 				RelativePath=".\Src\TextureCache.h"
 				>
 			</File>
-			<File
-				RelativePath=".\Src\TransformEngine.cpp"
-				>
-			</File>
-			<File
-				RelativePath=".\Src\TransformEngine.h"
-				>
-			</File>
-			<File
-				RelativePath=".\Transformer.hlsl"
-				>
-			</File>
 			<File
 				RelativePath=".\Src\VertexShader.cpp"
 				>
@@ -1314,11 +1310,11 @@
 				>
 			</File>
 			<File
-				RelativePath=".\Src\VertexShaderManager.cpp"
+				RelativePath=".\Src\VertexShaderCache.cpp"
 				>
 			</File>
 			<File
-				RelativePath=".\Src\VertexShaderManager.h"
+				RelativePath=".\Src\VertexShaderCache.h"
 				>
 			</File>
 		</Filter>

Source/Plugins/Plugin_VideoDX9/Src/D3DBase.cpp

@@ -258,6 +258,11 @@ namespace D3D
 		Vs.Major = (D3D::caps.VertexShaderVersion >>8) & 0xFF;
 		Vs.Minor = (D3D::caps.VertexShaderVersion) & 0xFF;
 
+		if (caps.NumSimultaneousRTs < 2)
+		{
+			MessageBox(0, "Warning - your graphics card does not support multiple render targets.", 0, 0);
+		}
+
 		// Device state would normally be set here
 		return S_OK;
 	}

Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.cpp

@@ -19,7 +19,7 @@
 #include "Statistics.h"
 #include "Utils.h"
 #include "Profiler.h"
-#include "PixelShaderManager.h"
+#include "PixelShaderCache.h"
 #include "VertexLoader.h"
 #include "BPMemory.h"
 #include "XFMemory.h"

Source/Plugins/Plugin_VideoDX9/Src/PixelShaderCache.h

@@ -15,12 +15,13 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#ifndef _PIXELSHADERMANAGER_H
+#ifndef _PIXELSHADERCACHE_H
-#define _PIXELSHADERMANAGER_H
+#define _PIXELSHADERCACHE_H
 
 #include "D3DBase.h"
 
 #include <map>
+
 #include "PixelShader.h"
 #include "VertexShader.h"
 
@@ -33,7 +34,6 @@ class PShaderCache
 	struct PSCacheEntry
 	{
 		LPDIRECT3DPIXELSHADER9 shader;
-		//CGPShader shader;
 
 		int frameCount;
 		PSCacheEntry()
@@ -48,7 +48,6 @@ class PShaderCache
 		}
 	};
 
-
 	typedef std::map<tevhash, PSCacheEntry> PSCache;
 
 	static PSCache pshaders;
@@ -61,4 +60,4 @@ public:
 };
 
 
-#endif  // _PIXELSHADERMANAGER_H
+#endif  // _PIXELSHADERCACHE_H

Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.cpp

@@ -21,7 +21,7 @@
 #include "Statistics.h"
 #include "Utils.h"
 #include "Profiler.h"
-#include "VertexShaderManager.h"
+#include "VertexShaderCache.h"
 #include "VertexLoader.h"
 #include "BPMemory.h"
 #include "XFMemory.h"

Source/Plugins/Plugin_VideoDX9/Src/VertexShaderCache.h

@@ -15,8 +15,8 @@
 // Official SVN repository and contact information can be found at
 // http://code.google.com/p/dolphin-emu/
 
-#ifndef _VERTEXSHADERMANAGER_H
+#ifndef _VERTEXSHADERCACHE_H
-#define _VERTEXSHADERMANAGER_H
+#define _VERTEXSHADERCACHE_H
 
 #include "D3DBase.h"
 
@@ -54,4 +54,4 @@ public:
 	static void SetShader();
 };
 
-#endif  // _VERTEXSHADERMANAGER_H
+#endif  // _VERTEXSHADERCACHE_H

Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp

@@ -123,7 +123,7 @@ FRAGMENTSHADER* PixelShaderCache::GetShader()
 	}
 
 	PSCacheEntry& newentry = pshaders[uid];
-	char *code = GeneratePixelShader(PixelShaderManager::GetTextureMask(),
+	const char *code = GeneratePixelShader(PixelShaderManager::GetTextureMask(),
 										   Renderer::GetZBufferTarget() != 0,
 										   Renderer::GetRenderMode() != Renderer::RM_Normal);
 

Source/Plugins/Plugin_VideoOGL/Src/TextureMngr.cpp

@@ -227,7 +227,7 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
     u8 *ptr = g_VideoInitialize.pGetMemoryPointer(address);
 
 	// Needed for texture format using tlut.
-	// TODO: Slower == Safer. Recalculate tlut lenght for each cases just to be sure.
+	// TODO: Slower == Safer. Recalculate tlut length for each cases just to be sure.
 	u32 hashseed = 0;
 	switch (format) {
 	case GX_TF_C4:
@@ -237,7 +237,7 @@ TextureMngr::TCacheEntry* TextureMngr::Load(int texstage, u32 address, int width
 		hashseed = TexDecoder_GetTlutHash((u16*)(texMem + tlutaddr), 256);
 		break;
 	case GX_TF_C14X2:
-		hashseed = TexDecoder_GetTlutHash((u16*)(texMem + tlutaddr), 384);
+		hashseed = TexDecoder_GetTlutHash((u16*)(texMem + tlutaddr), 512);
 		break;
 	}