mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Fix #846: support mixed ternary types.

Browse Source 
Vector conditions properly convert the true/false expression types to same
width vector as the condition.

Scalar conditions make the true/false expressions convert to each other.
This commit is contained in:
John Kessenich
2017-04-20 21:32:16 -06:00
parent 0603a383c1
commit 32a385e9d7
3 changed files with 759 additions and 593 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1313
Test/baseResults/hlsl.conditional.frag.out
View File

File diff suppressed because it is too large Load Diff

11
Test/hlsl.conditional.frag
View File

@@ -8,7 +8,14 @@ float4 vectorCond()
{
return (c4 ? t4 : f4) +
(c4 ? t : f ) +
(t4 < f4 ? t4 : f4);
(t4 < f4 ? t4 : f4) +
(c4 ? t : f4);
}
float4 scalarCond()
{
float4 ret = t != f ? t * f4 : 1;
return ret;
}
float2 fbSelect(bool2 cnd, float2 src0, float2 src1)
@@ -30,6 +37,6 @@ float4 PixelShaderFunction(float4 input) : COLOR0
e = a = b ? c = d : 10, b = a ? d = c : 11;
float4 f;
f = ret.x < input.y ? c * input : d * input;
return e * ret + f + vectorCond() +
return e * ret + f + vectorCond() + scalarCond() +
float4(fbSelect(bool2(true, false), float2(1.0, 2.0), float2(3.0, 4.0)), 10.0, 10.0);
}