From ba0287159abf6f117bb41be8704176b500e146db Mon Sep 17 00:00:00 2001 From: Jack Andersen <jackoalan@gmail.com> Date: Sun, 11 Sep 2016 18:56:51 -1000 Subject: [PATCH] HLSL/Metal shader conformance --- Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp | 2 +- Runtime/Graphics/Shaders/CTexturedQuadFilterMetal.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp b/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp index 54b8d4085..c40004c6d 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilterHLSL.cpp @@ -46,7 +46,7 @@ static const char* FS = "\n" "float4 main(in VertToFrag vtf) : SV_Target0\n" "{\n" -" return vtf.color * tex.Sample(samp, vtf.uv);\n" +" return vtf.color * float4(tex.Sample(samp, vtf.uv).rgb, 1.0);\n" "}\n"; URDE_DECL_SPECIALIZE_MULTI_BLEND_SHADER(CTexturedQuadFilter) diff --git a/Runtime/Graphics/Shaders/CTexturedQuadFilterMetal.cpp b/Runtime/Graphics/Shaders/CTexturedQuadFilterMetal.cpp index 988585deb..cf2a28c77 100644 --- a/Runtime/Graphics/Shaders/CTexturedQuadFilterMetal.cpp +++ b/Runtime/Graphics/Shaders/CTexturedQuadFilterMetal.cpp @@ -48,7 +48,7 @@ static const char* FS = "\n" "fragment float4 fmain(VertToFrag vtf [[ stage_in ]], texture2d<float> tex [[ texture(0) ]])\n" "{\n" -" return vtf.color * tex.sample(samp, vtf.uv);\n" +" return vtf.color * float4(tex.sample(samp, vtf.uv).rgb, 1.0);\n" "}\n"; URDE_DECL_SPECIALIZE_MULTI_BLEND_SHADER(CTexturedQuadFilter)