From 0a062d0138c1830420ed0100eca2a0f6f326f6cb Mon Sep 17 00:00:00 2001 From: Jack Andersen Date: Thu, 9 Feb 2017 23:09:06 -1000 Subject: [PATCH] Fix shader compile fail --- Runtime/Graphics/Shaders/CModelShadersGLSL.cpp | 4 ++-- Runtime/Graphics/Shaders/CModelShadersHLSL.cpp | 4 ++-- Runtime/Graphics/Shaders/CModelShadersMetal.cpp | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp b/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp index 2c33c7d6a..0c4b98f07 100644 --- a/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp +++ b/Runtime/Graphics/Shaders/CModelShadersGLSL.cpp @@ -63,12 +63,12 @@ static const char* MainPostGLSL = static const char* ThermalPostGLSL = "UBINDING2 uniform ThermalUniform\n" "{\n" -" vec4 mulColor;\n" +" vec4 tmulColor;\n" " vec4 addColor;\n" "};\n" "vec4 ThermalPostFunc(vec4 colorIn)\n" "{\n" -" return vec4(texture(tex7, vtf.extTcgs[0]).rrr * mulColor.rgb + addColor.rgb, 1.0);\n" +" return vec4(texture(tex7, vtf.extTcgs[0]).rrr * tmulColor.rgb + addColor.rgb, 1.0);\n" "}\n" "\n"; diff --git a/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp b/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp index ed03b9d88..3ac9d15e6 100644 --- a/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp +++ b/Runtime/Graphics/Shaders/CModelShadersHLSL.cpp @@ -62,12 +62,12 @@ static const char* MainPostHLSL = static const char* ThermalPostHLSL = "cbuffer ThermalUniform : register(b2)\n" "{\n" -" float4 mulColor;\n" +" float4 tmulColor;\n" " float4 addColor;\n" "};\n" "static float4 ThermalPostFunc(in VertToFrag vtf, float4 colorIn)\n" "{\n" -" return float4(extTex7.Sample(samp, vtf.extTcgs[0]).rrr * mulColor.rgb + addColor.rgb, 1.0);\n" +" return float4(extTex7.Sample(samp, vtf.extTcgs[0]).rrr * tmulColor.rgb + addColor.rgb, 1.0);\n" "}\n" "\n"; diff --git a/Runtime/Graphics/Shaders/CModelShadersMetal.cpp b/Runtime/Graphics/Shaders/CModelShadersMetal.cpp index 69c06e5e8..c5e3c65dc 100644 --- a/Runtime/Graphics/Shaders/CModelShadersMetal.cpp +++ b/Runtime/Graphics/Shaders/CModelShadersMetal.cpp @@ -62,12 +62,12 @@ static const char* MainPostMetal = static const char* ThermalPostMetal = "struct ThermalUniform\n" "{\n" -" float4 mulColor;\n" +" float4 tmulColor;\n" " float4 addColor;\n" "};\n" "static float4 ThermalPostFunc(thread VertToFrag& vtf, constant ThermalUniform& lu, texture2d tex7, float4 colorIn)\n" "{\n" -" return float4(tex7.sample(samp, vtf.extTcgs0).rrr * lu.mulColor.rgb + lu.addColor.rgb, 1.0);\n" +" return float4(tex7.sample(samp, vtf.extTcgs0).rrr * lu.tmulColor.rgb + lu.addColor.rgb, 1.0);\n" "}\n" "\n";