Fix subgroup support for ray tracing

Closes #1735

GlslangToSpv.cpp
- minor formatting cleanup

BaseTypes.h
- minor formatting cleanup
- add subgroup builtins to GetBuiltInVariableString
  (was resulting in "unknown built-in variable" messages in test output)

Initialize.cpp
- better naming and re-use of strings for subgroup builtin variable declarations
- define subgroup builtin variables in ray-tracing shaders

intermOut.cpp
- add handling of the EOpSubgroupParition* variables
  (was resulting in "ERROR: Bad aggregation op" messages in test output)

Update test results.
This commit is contained in:
Daniel Koch 2019-05-27 16:46:31 -04:00
parent c3e60ad9b6
commit 593a4e0aa5
45 changed files with 2237 additions and 3886 deletions

View file

@ -12,8 +12,8 @@ local_size = (8, 8, 1)
0:17 'invocation' ( temp uint)
0:17 mod ( temp uint)
0:17 add ( temp uint)
0:17 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:17 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:17 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
0:17 'gl_SubgroupSize' ( in uint SubgroupSize)
0:17 Constant:
0:17 4 (const uint)
0:19 Sequence
@ -23,11 +23,11 @@ local_size = (8, 8, 1)
0:21 add ( temp 4-component vector of uint)
0:20 add ( temp 4-component vector of uint)
0:19 add ( temp 4-component vector of uint)
0:19 'gl_SubgroupEqMask' ( in 4-component vector of uint unknown built-in variable)
0:20 'gl_SubgroupGeMask' ( in 4-component vector of uint unknown built-in variable)
0:21 'gl_SubgroupGtMask' ( in 4-component vector of uint unknown built-in variable)
0:22 'gl_SubgroupLeMask' ( in 4-component vector of uint unknown built-in variable)
0:23 'gl_SubgroupLtMask' ( in 4-component vector of uint unknown built-in variable)
0:19 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
0:20 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
0:21 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
0:22 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
0:23 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
0:25 Sequence
0:25 move second child to first child ( temp 4-component vector of uint)
0:25 'result' ( temp 4-component vector of uint)
@ -1165,8 +1165,8 @@ local_size = (8, 8, 1)
0:17 'invocation' ( temp uint)
0:17 mod ( temp uint)
0:17 add ( temp uint)
0:17 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:17 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:17 'gl_SubgroupInvocationID' ( in uint SubgroupInvocationID)
0:17 'gl_SubgroupSize' ( in uint SubgroupSize)
0:17 Constant:
0:17 4 (const uint)
0:19 Sequence
@ -1176,11 +1176,11 @@ local_size = (8, 8, 1)
0:21 add ( temp 4-component vector of uint)
0:20 add ( temp 4-component vector of uint)
0:19 add ( temp 4-component vector of uint)
0:19 'gl_SubgroupEqMask' ( in 4-component vector of uint unknown built-in variable)
0:20 'gl_SubgroupGeMask' ( in 4-component vector of uint unknown built-in variable)
0:21 'gl_SubgroupGtMask' ( in 4-component vector of uint unknown built-in variable)
0:22 'gl_SubgroupLeMask' ( in 4-component vector of uint unknown built-in variable)
0:23 'gl_SubgroupLtMask' ( in 4-component vector of uint unknown built-in variable)
0:19 'gl_SubgroupEqMask' ( in 4-component vector of uint SubgroupEqMask)
0:20 'gl_SubgroupGeMask' ( in 4-component vector of uint SubgroupGeMask)
0:21 'gl_SubgroupGtMask' ( in 4-component vector of uint SubgroupGtMask)
0:22 'gl_SubgroupLeMask' ( in 4-component vector of uint SubgroupLeMask)
0:23 'gl_SubgroupLtMask' ( in 4-component vector of uint SubgroupLtMask)
0:25 Sequence
0:25 move second child to first child ( temp 4-component vector of uint)
0:25 'result' ( temp 4-component vector of uint)