HLSL: fix type on clip/cull index result

While adding geometry stage support for clip/cull, it transpired that the
existing clip/cull support was not setting the type of the result of indexing
into the clup/cull variable.  That's a defect independent of the geometry
support, so to simplify the geometry PR, this is addressed separately.

It doesn't appear to change the generated SPIR-V, but that's probably down to
something else tolerating a bad input.
This commit is contained in:
LoopDawg 2017-08-28 14:05:41 -06:00
parent 82e95a3aa5
commit d6f4d9b48c
18 changed files with 180 additions and 174 deletions

View file

@ -41,7 +41,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 0 (const int)
@ -53,7 +53,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 1 (const int)
@ -65,7 +65,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 2 (const int)
@ -77,7 +77,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 3 (const int)
@ -90,7 +90,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 0 (const int)
@ -102,7 +102,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 1 (const int)
@ -114,7 +114,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 2 (const int)
@ -126,7 +126,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 3 (const int)
@ -188,7 +188,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 0 (const int)
@ -200,7 +200,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 1 (const int)
@ -212,7 +212,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 2 (const int)
@ -224,7 +224,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float ClipDistance)
0:? 'clip' ( in 4-element array of float ClipDistance)
0:4 Constant:
0:4 3 (const int)
@ -237,7 +237,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 0 (const int)
@ -249,7 +249,7 @@ gl_FragCoord origin is upper left
0:4 0 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 1 (const int)
@ -261,7 +261,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 0 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 2 (const int)
@ -273,7 +273,7 @@ gl_FragCoord origin is upper left
0:4 1 (const int)
0:4 Constant:
0:4 1 (const int)
0:4 direct index ( temp float)
0:4 direct index ( in float CullDistance)
0:? 'cull' ( in 4-element array of float CullDistance)
0:4 Constant:
0:4 3 (const int)