From e016de860ac0a7dec14c6ab4caefc405bf791d07 Mon Sep 17 00:00:00 2001 From: Bill Hollings Date: Thu, 9 Feb 2017 13:16:13 -0500 Subject: [PATCH] Update MSL reference shaders affected by upstream pull. --- reference/shaders-msl/frag/mix.frag | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) diff --git a/reference/shaders-msl/frag/mix.frag b/reference/shaders-msl/frag/mix.frag index fe1229ce..33157811 100644 --- a/reference/shaders-msl/frag/mix.frag +++ b/reference/shaders-msl/frag/mix.frag @@ -23,26 +23,8 @@ fragment main0_out main0(main0_in in [[stage_in]]) out.FragColor = float4(l.x ? in.vIn1.x : in.vIn0.x, l.y ? in.vIn1.y : in.vIn0.y, l.z ? in.vIn1.z : in.vIn0.z, l.w ? in.vIn1.w : in.vIn0.w); bool f = true; out.FragColor = float4(f ? in.vIn3 : in.vIn2); - float4 _35; - if (f) - { - _35 = in.vIn0; - } - else - { - _35 = in.vIn1; - } - out.FragColor = _35; - float _44; - if (f) - { - _44 = in.vIn2; - } - else - { - _44 = in.vIn3; - } - out.FragColor = float4(_44); + out.FragColor = f ? in.vIn0 : in.vIn1; + out.FragColor = float4(f ? in.vIn2 : in.vIn3); return out; }