diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index 39bbdc6316..9dfa6cf064 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -318,9 +318,8 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T
 		// Let's set up attributes
 		if (xfregs.numTexGen.numTexGens < 7)
 		{
-			for (int i = 0; i < 8; ++i)
-				if(i < xfregs.numTexGen.numTexGens)
-					out.Write("VARYIN float3 uv%d_2;\n", i);
+			for (int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+				out.Write("VARYIN float3 uv%d_2;\n", i);
 			out.Write("VARYIN float4 clipPos_2;\n");
 			if (g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 			{
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index f8adbec049..6d137a376f 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -483,9 +483,8 @@ static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_typ
 
 		if (xfregs.numTexGen.numTexGens < 7)
 		{
-			for (unsigned int i = 0; i < 8; ++i)
-				if(i < xfregs.numTexGen.numTexGens)
-					out.Write(" uv%d_2.xyz =  o.tex%d;\n", i, i);
+			for (unsigned int i = 0; i < xfregs.numTexGen.numTexGens; ++i)
+				out.Write(" uv%d_2.xyz =  o.tex%d;\n", i, i);
 			out.Write("  clipPos_2 = o.clipPos;\n");
 			if(g_ActiveConfig.bEnablePixelLighting && g_ActiveConfig.backend_info.bSupportsPixelLighting)
 				out.Write("  Normal_2 = o.Normal;\n");