From 6109958e68112005506c66801ab73e54cac8b4bb Mon Sep 17 00:00:00 2001 From: degasus Date: Sun, 30 Mar 2014 12:22:59 +0200 Subject: [PATCH] ShaderGen: OGL: don't make a copy of "Normal" --- Source/Core/VideoCommon/PixelShaderGen.cpp | 6 +----- Source/Core/VideoCommon/VertexShaderGen.cpp | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/Core/VideoCommon/PixelShaderGen.cpp b/Source/Core/VideoCommon/PixelShaderGen.cpp index f92054d0cf..28e65c9682 100644 --- a/Source/Core/VideoCommon/PixelShaderGen.cpp +++ b/Source/Core/VideoCommon/PixelShaderGen.cpp @@ -301,7 +301,7 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T out.Write("centroid in float4 clipPos;\n"); if (g_ActiveConfig.bEnablePixelLighting) { - out.Write("centroid in float4 Normal_2;\n"); + out.Write("centroid in float4 Normal;\n"); } out.Write("void main()\n{\n"); @@ -349,10 +349,6 @@ static inline void GeneratePixelShader(T& out, DSTALPHA_MODE dstAlphaMode, API_T out.Write("\tfloat3 uv%d = uv%d_2;\n", i, i); } } - if (g_ActiveConfig.bEnablePixelLighting) - { - out.Write("\tfloat4 Normal = Normal_2;\n"); - } } if (g_ActiveConfig.bEnablePixelLighting) diff --git a/Source/Core/VideoCommon/VertexShaderGen.cpp b/Source/Core/VideoCommon/VertexShaderGen.cpp index 2a98502091..9bb1ffcf2e 100644 --- a/Source/Core/VideoCommon/VertexShaderGen.cpp +++ b/Source/Core/VideoCommon/VertexShaderGen.cpp @@ -139,7 +139,7 @@ static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_typ } out.Write("centroid out float4 clipPos;\n"); if (g_ActiveConfig.bEnablePixelLighting) - out.Write("centroid out float4 Normal_2;\n"); + out.Write("centroid out float4 Normal;\n"); out.Write("centroid out float4 colors_02;\n"); out.Write("centroid out float4 colors_12;\n"); @@ -436,7 +436,7 @@ static inline void GenerateVertexShader(T& out, u32 components, API_TYPE api_typ out.Write(" uv%d_2.xyz = o.tex%d;\n", i, i); out.Write(" clipPos = o.clipPos;\n"); if (g_ActiveConfig.bEnablePixelLighting) - out.Write(" Normal_2 = o.Normal;\n"); + out.Write(" Normal = o.Normal;\n"); out.Write("colors_02 = o.colors_0;\n"); out.Write("colors_12 = o.colors_1;\n");