From 41b72ffc8bac98e97479064f9e2497ebc118c5da Mon Sep 17 00:00:00 2001
From: Sonicadvance1 <sonicadvance1@gmail.com>
Date: Mon, 13 Oct 2008 21:59:51 +0000
Subject: [PATCH] Fixes Wario World for using an Invalid Texture coordinate,
 Tell me if it breaks anything

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@852 8ced0084-cf51-0410-be5f-012b33b47a6e
---
 .../Plugin_VideoOGL/Src/PixelShader.cpp       | 21 ++++++++++++-------
 .../Src/VertexShaderManager.cpp               |  4 ----
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShader.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShader.cpp
index e26fd72580..774645b8ab 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShader.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShader.cpp
@@ -606,21 +606,26 @@ void WriteStage(char *&p, int n, u32 texture_mask)
         int texmap = bpmem.tevorders[n/2].getTexMap(n&1);
         if(!bHasIndStage) {
             // calc tevcord
+            //tevcoord.xy = texdim[1].xy * uv1.xy / uv1.z;
+            int OurTexCoord = 0;
+            if(bpmem.genMode.numtexgens)
+                OurTexCoord = texcoord;
+            else
+                OurTexCoord = 0;
             if( texture_mask & (1<<texmap) ) {
                 // nonpow2
                 if( texfun == XF_TEXPROJ_STQ )
-                    WRITE(p,"tevcoord.xy = uv%d.xy / uv%d.z;\n", texcoord, texcoord);
+                    WRITE(p,"tevcoord.xy = uv%d.xy / uv%d.z;\n", texcoord, OurTexCoord);
                 else
-                    WRITE(p,"tevcoord.xy = uv%d.xy;\n", texcoord);
+                    WRITE(p,"tevcoord.xy = uv%d.xy;\n", OurTexCoord);
                 WrapNonPow2Tex(p, "tevcoord", texmap, texture_mask);
             }
             else {
-                if( texfun == XF_TEXPROJ_STQ ) {
-                    WRITE(p,"tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy / uv%d.z;\n", texmap, texcoord, texcoord);
-                }
-                else {
-                    WRITE(p,"tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy;\n", texmap, texcoord);
-                }
+                if( texfun == XF_TEXPROJ_STQ ) 
+                    WRITE(p,"tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy / uv%d.z;\n", texmap, OurTexCoord , OurTexCoord );
+                else 
+                    WRITE(p,"tevcoord.xy = "I_TEXDIMS"[%d].xy * uv%d.xy;\n", texmap, OurTexCoord);
+
             }
         }
         else if( texture_mask & (1<<texmap) ) {
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
index 6e7bf4f83e..97f1673b73 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderManager.cpp
@@ -163,11 +163,7 @@ bool VertexShaderMngr::CompileVertexShader(VERTEXSHADER& vs, const char* pstrpro
 {
     char stropt[64];
     sprintf(stropt, "MaxLocalParams=256,MaxInstructions=%d", s_nMaxVertexInstructions);
-#ifdef _WIN32
     const char* opts[] = {"-profileopts",stropt,"-O2", "-q", NULL};
-#else
-    const char* opts[] = {"-profileopts",stropt,"-q", NULL};
-#endif
     CGprogram tempprog = cgCreateProgram(g_cgcontext, CG_SOURCE, pstrprogram, g_cgvProf, "main", opts);
     if (!cgIsProgram(tempprog) || cgGetError() != CG_NO_ERROR) {
         ERROR_LOG("Failed to load vs %s:\n", cgGetLastListing(g_cgcontext));