AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix shader compile fail

This commit is contained in:
Jack Andersen 2017-02-09 23:09:06 -10:00
parent 268f64b6c7
commit 0a062d0138
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Runtime/Graphics/Shaders/CModelShadersGLSL.cpp
View File

@ -63,12 +63,12 @@ static const char* MainPostGLSL =
static const char* ThermalPostGLSL = static const char* ThermalPostGLSL =
"UBINDING2 uniform ThermalUniform\n" "UBINDING2 uniform ThermalUniform\n"
"{\n" "{\n"
" vec4 mulColor;\n" " vec4 tmulColor;\n"
" vec4 addColor;\n" " vec4 addColor;\n"
"};\n" "};\n"
"vec4 ThermalPostFunc(vec4 colorIn)\n" "vec4 ThermalPostFunc(vec4 colorIn)\n"
"{\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"
"\n"; "\n";

4
Runtime/Graphics/Shaders/CModelShadersHLSL.cpp
View File

@ -62,12 +62,12 @@ static const char* MainPostHLSL =
static const char* ThermalPostHLSL = static const char* ThermalPostHLSL =
"cbuffer ThermalUniform : register(b2)\n" "cbuffer ThermalUniform : register(b2)\n"
"{\n" "{\n"
" float4 mulColor;\n" " float4 tmulColor;\n"
" float4 addColor;\n" " float4 addColor;\n"
"};\n" "};\n"
"static float4 ThermalPostFunc(in VertToFrag vtf, float4 colorIn)\n" "static float4 ThermalPostFunc(in VertToFrag vtf, float4 colorIn)\n"
"{\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"
"\n"; "\n";

4
Runtime/Graphics/Shaders/CModelShadersMetal.cpp
View File

@ -62,12 +62,12 @@ static const char* MainPostMetal =
static const char* ThermalPostMetal = static const char* ThermalPostMetal =
"struct ThermalUniform\n" "struct ThermalUniform\n"
"{\n" "{\n"
" float4 mulColor;\n" " float4 tmulColor;\n"
" float4 addColor;\n" " float4 addColor;\n"
"};\n" "};\n"
"static float4 ThermalPostFunc(thread VertToFrag& vtf, constant ThermalUniform& lu, texture2d<float> tex7, float4 colorIn)\n" "static float4 ThermalPostFunc(thread VertToFrag& vtf, constant ThermalUniform& lu, texture2d<float> tex7, float4 colorIn)\n"
"{\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"
"\n"; "\n";