D3D progress, report whether it made things better or worse HERE.

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

2 files changed, 6 insertions, 8 deletions

diff --git a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
index cef384fcb2..6c23bb6fbd 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/Render.cpp
@@ -93,8 +93,8 @@ void Renderer::Init(SVideoInitialize &_VideoInitialize)
 	cgGetError();
 	cgSetErrorHandler(HandleCgError, NULL);
 	cgD3D9SetDevice(D3D::dev);
-	g_cgvProf = cgD3D9GetLatestVertexProfile();
-	g_cgfProf = cgD3D9GetLatestPixelProfile();
+	g_cgvProf = cgGetProfile("vs_2_0"); //cgD3D9GetLatestVertexProfile();
+	g_cgfProf = cgGetProfile("ps_2_0"); //cgD3D9GetLatestPixelProfile();
 
 	float width =  (float)D3D::GetDisplayWidth();
 	float height = (float)D3D::GetDisplayHeight();
diff --git a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
index 3acfb460e0..7dd66dc763 100644
--- a/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
+++ b/Source/Plugins/Plugin_VideoDX9/Src/VertexManager.cpp
@@ -55,8 +55,6 @@ enum Collection
 static IndexGenerator indexGen;
 static Collection collection;
 
-static LPDIRECT3DVERTEXDECLARATION9 vDecl;
-
 static u8 *fakeVBuffer;   // format undefined - NativeVertexFormat takes care of the declaration.
 static u16 *fakeIBuffer;  // These are just straightforward 16-bit indices.
 
@@ -236,13 +234,13 @@ void Flush()
 		int numVertices = indexGen.GetNumVerts();
 		if (numVertices)
 		{
-			PixelShaderCache::SetShader();
-			VertexShaderCache::SetShader(g_nativeVertexFmt->m_components);
-
 			// set global constants
 			VertexShaderManager::SetConstants(false);
 			PixelShaderManager::SetConstants();
-	
+
+			PixelShaderCache::SetShader();
+			VertexShaderCache::SetShader(g_nativeVertexFmt->m_components);
+
 			int stride = g_nativeVertexFmt->GetVertexStride();
 			g_nativeVertexFmt->SetupVertexPointers();
 			if (collection != C_POINTS)