1 files changed, 20 insertions, 18 deletions

diff --git a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
index 4f6cd8da2d..3d4ddd2f35 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderManager.cpp
@@ -85,37 +85,39 @@ void PixelShaderManager::Shutdown()
 
 void PixelShaderManager::SetConstants()
 {
+	if (g_ActiveConfig.bUseGLSL)
+		Dirty();
     for (int i = 0; i < 2; ++i)
 	{
-        if (s_nColorsChanged[i] || g_ActiveConfig.bUseGLSL)
+        if (s_nColorsChanged[i])
 		{
             int baseind = i ? C_KCOLORS : C_COLORS;
             for (int j = 0; j < 4; ++j)
 			{
-                if (s_nColorsChanged[i] & (1 << j) || g_ActiveConfig.bUseGLSL)
+                if (s_nColorsChanged[i] & (1 << j))
                     SetPSConstant4fv(baseind+j, &lastRGBAfull[i][j][0]);
             }
             s_nColorsChanged[i] = 0;
         }
     }
 
-    if (s_nTexDimsChanged || g_ActiveConfig.bUseGLSL)
+    if (s_nTexDimsChanged)
 	{
         for (int i = 0; i < 8; ++i)
 		{
-            if (s_nTexDimsChanged & (1<<i) || g_ActiveConfig.bUseGLSL)
+            if (s_nTexDimsChanged & (1<<i))
 				SetPSTextureDims(i);
         }
         s_nTexDimsChanged = 0;
     }
 
-    if (s_bAlphaChanged || g_ActiveConfig.bUseGLSL)
+    if (s_bAlphaChanged)
 	{
 		SetPSConstant4f(C_ALPHA, (lastAlpha&0xff)/255.0f, ((lastAlpha>>8)&0xff)/255.0f, 0, ((lastAlpha>>16)&0xff)/255.0f);
 		s_bAlphaChanged = false;
     }
 
-	if (s_bZTextureTypeChanged || g_ActiveConfig.bUseGLSL)
+	if (s_bZTextureTypeChanged)
 	{
         float ftemp[4];
         switch (bpmem.ztex2.type)
@@ -137,7 +139,7 @@ void PixelShaderManager::SetConstants()
 		s_bZTextureTypeChanged = false;
 	}
 
-	if (s_bZBiasChanged || s_bDepthRangeChanged || g_ActiveConfig.bUseGLSL)
+	if (s_bZBiasChanged || s_bDepthRangeChanged)
 	{
         // reversed gxsetviewport(xorig, yorig, width, height, nearz, farz)
 		// [0] = width/2
@@ -153,12 +155,12 @@ void PixelShaderManager::SetConstants()
     }
 
     // indirect incoming texture scales
-    if (s_nIndTexScaleChanged || g_ActiveConfig.bUseGLSL)
+    if (s_nIndTexScaleChanged)
 	{
 		// set as two sets of vec4s, each containing S and T of two ind stages.
         float f[8];
 
-        if (s_nIndTexScaleChanged & 0x03 || g_ActiveConfig.bUseGLSL)
+        if (s_nIndTexScaleChanged & 0x03)
 		{
             for (u32 i = 0; i < 2; ++i)
 			{
@@ -169,7 +171,7 @@ void PixelShaderManager::SetConstants()
 			SetPSConstant4fv(C_INDTEXSCALE, f);
         }
 
-        if (s_nIndTexScaleChanged & 0x0c || g_ActiveConfig.bUseGLSL) {
+        if (s_nIndTexScaleChanged & 0x0c) {
             for (u32 i = 2; i < 4; ++i) {
                 f[2 * i] = bpmem.texscale[1].getScaleS(i & 1);
                 f[2 * i + 1] = bpmem.texscale[1].getScaleT(i & 1);
@@ -181,11 +183,11 @@ void PixelShaderManager::SetConstants()
         s_nIndTexScaleChanged = 0;
     }
 
-    if (s_nIndTexMtxChanged || g_ActiveConfig.bUseGLSL)
+    if (s_nIndTexMtxChanged)
 	{
         for (int i = 0; i < 3; ++i)
 		{
-            if (s_nIndTexMtxChanged & (1 << i) || g_ActiveConfig.bUseGLSL)
+            if (s_nIndTexMtxChanged & (1 << i))
 			{
                 int scale = ((u32)bpmem.indmtx[i].col0.s0 << 0) |
 					        ((u32)bpmem.indmtx[i].col1.s1 << 2) |
@@ -215,13 +217,13 @@ void PixelShaderManager::SetConstants()
         s_nIndTexMtxChanged = 0;
     }
 
-    if (s_bFogColorChanged || g_ActiveConfig.bUseGLSL)
+    if (s_bFogColorChanged)
 	{
 		SetPSConstant4f(C_FOG, bpmem.fog.color.r / 255.0f, bpmem.fog.color.g / 255.0f, bpmem.fog.color.b / 255.0f, 0);
 		s_bFogColorChanged = false;
     }
 
-    if (s_bFogParamChanged || g_ActiveConfig.bUseGLSL)
+    if (s_bFogParamChanged)
 	{
 		if(!g_ActiveConfig.bDisableFog)
 		{
@@ -237,7 +239,7 @@ void PixelShaderManager::SetConstants()
         s_bFogParamChanged = false;
     }
 
-	if (s_bFogRangeAdjustChanged || g_ActiveConfig.bUseGLSL)
+	if (s_bFogRangeAdjustChanged)
 	{
 		if(!g_ActiveConfig.bDisableFog && bpmem.fogRange.Base.Enabled == 1)
 		{
@@ -261,7 +263,7 @@ void PixelShaderManager::SetConstants()
 
 	if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)  // config check added because the code in here was crashing for me inside SetPSConstant4f
 	{
-		if (nLightsChanged[0] >= 0 || g_ActiveConfig.bUseGLSL)
+		if (nLightsChanged[0] >= 0)
 		{
 			// lights don't have a 1 to 1 mapping, the color component needs to be converted to 4 floats
 			int istart = nLightsChanged[0] / 0x10;
@@ -297,14 +299,14 @@ void PixelShaderManager::SetConstants()
 			nLightsChanged[0] = nLightsChanged[1] = -1;
 		}
 
-		if (nMaterialsChanged || g_ActiveConfig.bUseGLSL)
+		if (nMaterialsChanged)
 		{
 			float GC_ALIGNED16(material[4]);
 			float NormalizationCoef = 1 / 255.0f;
 
 			for (int i = 0; i < 4; ++i)
 			{
-				if (nMaterialsChanged & (1 << i) || g_ActiveConfig.bUseGLSL)
+				if (nMaterialsChanged & (1 << i))
 				{
 					u32 data = *(xfregs.ambColor + i);