Skip to content

Commit

Permalink
Merge pull request #1741 from dgkoch/shader_subgroup
Browse files Browse the repository at this point in the history
Enable GL_KHR_shader_subgroup properly
  • Loading branch information
johnkslang authored Mar 27, 2019
2 parents 5efb004 + 83170e3 commit 5125eb5
Show file tree
Hide file tree
Showing 66 changed files with 95,051 additions and 10 deletions.
41 changes: 41 additions & 0 deletions Test/baseResults/glsl.450.subgroup.frag.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
glsl.450.subgroup.frag
Shader version: 450
Requested GL_KHR_shader_subgroup_basic
0:? Sequence
0:4 Function Definition: main( ( global void)
0:4 Function Parameters:
0:6 Sequence
0:6 move second child to first child ( temp 4-component vector of uint)
0:6 'data' (layout( location=0) out 4-component vector of uint)
0:6 Construct uvec4 ( temp 4-component vector of uint)
0:6 'gl_SubgroupSize' ( flat in uint unknown built-in variable)
0:6 'gl_SubgroupInvocationID' ( flat in uint unknown built-in variable)
0:6 Constant:
0:6 0 (const uint)
0:6 Constant:
0:6 0 (const uint)
0:? Linker Objects
0:? 'data' (layout( location=0) out 4-component vector of uint)


Linked fragment stage:


Shader version: 450
Requested GL_KHR_shader_subgroup_basic
0:? Sequence
0:4 Function Definition: main( ( global void)
0:4 Function Parameters:
0:6 Sequence
0:6 move second child to first child ( temp 4-component vector of uint)
0:6 'data' (layout( location=0) out 4-component vector of uint)
0:6 Construct uvec4 ( temp 4-component vector of uint)
0:6 'gl_SubgroupSize' ( flat in uint unknown built-in variable)
0:6 'gl_SubgroupInvocationID' ( flat in uint unknown built-in variable)
0:6 Constant:
0:6 0 (const uint)
0:6 Constant:
0:6 0 (const uint)
0:? Linker Objects
0:? 'data' (layout( location=0) out 4-component vector of uint)

59 changes: 59 additions & 0 deletions Test/baseResults/glsl.450.subgroup.geom.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
glsl.450.subgroup.geom
Shader version: 450
Requested GL_KHR_shader_subgroup_basic
invocations = -1
max_vertices = 1
input primitive = points
output primitive = points
0:? Sequence
0:10 Function Definition: main( ( global void)
0:10 Function Parameters:
0:12 Sequence
0:12 move second child to first child ( temp 4-component vector of uint)
0:12 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:12 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:12 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:12 Constant:
0:12 0 (const uint)
0:12 'gl_PrimitiveIDIn' ( in int PrimitiveID)
0:12 Construct uvec4 ( temp 4-component vector of uint)
0:12 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:12 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:12 Constant:
0:12 0 (const uint)
0:12 Constant:
0:12 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})


Linked geometry stage:


Shader version: 450
Requested GL_KHR_shader_subgroup_basic
invocations = 1
max_vertices = 1
input primitive = points
output primitive = points
0:? Sequence
0:10 Function Definition: main( ( global void)
0:10 Function Parameters:
0:12 Sequence
0:12 move second child to first child ( temp 4-component vector of uint)
0:12 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:12 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:12 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:12 Constant:
0:12 0 (const uint)
0:12 'gl_PrimitiveIDIn' ( in int PrimitiveID)
0:12 Construct uvec4 ( temp 4-component vector of uint)
0:12 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:12 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:12 Constant:
0:12 0 (const uint)
0:12 Constant:
0:12 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})

53 changes: 53 additions & 0 deletions Test/baseResults/glsl.450.subgroup.tesc.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
glsl.450.subgroup.tesc
Shader version: 450
Requested GL_KHR_shader_subgroup_basic
vertices = 1
0:? Sequence
0:9 Function Definition: main( ( global void)
0:9 Function Parameters:
0:11 Sequence
0:11 move second child to first child ( temp 4-component vector of uint)
0:11 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:11 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:11 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:11 Constant:
0:11 0 (const uint)
0:11 'gl_PrimitiveID' ( in int PrimitiveID)
0:11 Construct uvec4 ( temp 4-component vector of uint)
0:11 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:11 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:11 Constant:
0:11 0 (const uint)
0:11 Constant:
0:11 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})


Linked tessellation control stage:


Shader version: 450
Requested GL_KHR_shader_subgroup_basic
vertices = 1
0:? Sequence
0:9 Function Definition: main( ( global void)
0:9 Function Parameters:
0:11 Sequence
0:11 move second child to first child ( temp 4-component vector of uint)
0:11 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:11 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:11 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:11 Constant:
0:11 0 (const uint)
0:11 'gl_PrimitiveID' ( in int PrimitiveID)
0:11 Construct uvec4 ( temp 4-component vector of uint)
0:11 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:11 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:11 Constant:
0:11 0 (const uint)
0:11 Constant:
0:11 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})

57 changes: 57 additions & 0 deletions Test/baseResults/glsl.450.subgroup.tese.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
glsl.450.subgroup.tese
Shader version: 450
Requested GL_KHR_shader_subgroup_basic
input primitive = isolines
vertex spacing = none
triangle order = none
0:? Sequence
0:9 Function Definition: main( ( global void)
0:9 Function Parameters:
0:11 Sequence
0:11 move second child to first child ( temp 4-component vector of uint)
0:11 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:11 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:11 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:11 Constant:
0:11 0 (const uint)
0:11 'gl_PrimitiveID' ( in int PrimitiveID)
0:11 Construct uvec4 ( temp 4-component vector of uint)
0:11 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:11 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:11 Constant:
0:11 0 (const uint)
0:11 Constant:
0:11 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})


Linked tessellation evaluation stage:


Shader version: 450
Requested GL_KHR_shader_subgroup_basic
input primitive = isolines
vertex spacing = equal_spacing
triangle order = ccw
0:? Sequence
0:9 Function Definition: main( ( global void)
0:9 Function Parameters:
0:11 Sequence
0:11 move second child to first child ( temp 4-component vector of uint)
0:11 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:11 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:11 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:11 Constant:
0:11 0 (const uint)
0:11 'gl_PrimitiveID' ( in int PrimitiveID)
0:11 Construct uvec4 ( temp 4-component vector of uint)
0:11 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:11 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:11 Constant:
0:11 0 (const uint)
0:11 Constant:
0:11 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})

55 changes: 55 additions & 0 deletions Test/baseResults/glsl.450.subgroup.vert.out
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
glsl.450.subgroup.vert
Shader version: 450
Requested GL_KHR_shader_subgroup_basic
0:? Sequence
0:8 Function Definition: main( ( global void)
0:8 Function Parameters:
0:10 Sequence
0:10 move second child to first child ( temp 4-component vector of uint)
0:10 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:10 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:10 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:10 Constant:
0:10 0 (const uint)
0:10 'gl_VertexID' ( gl_VertexId int VertexId)
0:10 Construct uvec4 ( temp 4-component vector of uint)
0:10 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:10 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:10 Constant:
0:10 0 (const uint)
0:10 Constant:
0:10 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:? 'gl_VertexID' ( gl_VertexId int VertexId)
0:? 'gl_InstanceID' ( gl_InstanceId int InstanceId)


Linked vertex stage:


Shader version: 450
Requested GL_KHR_shader_subgroup_basic
0:? Sequence
0:8 Function Definition: main( ( global void)
0:8 Function Parameters:
0:10 Sequence
0:10 move second child to first child ( temp 4-component vector of uint)
0:10 indirect index (layout( column_major std430 offset=0) temp 4-component vector of uint)
0:10 result: direct index for structure (layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint)
0:10 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:10 Constant:
0:10 0 (const uint)
0:10 'gl_VertexID' ( gl_VertexId int VertexId)
0:10 Construct uvec4 ( temp 4-component vector of uint)
0:10 'gl_SubgroupSize' ( in uint unknown built-in variable)
0:10 'gl_SubgroupInvocationID' ( in uint unknown built-in variable)
0:10 Constant:
0:10 0 (const uint)
0:10 Constant:
0:10 0 (const uint)
0:? Linker Objects
0:? 'anon@0' (layout( set=0 binding=0 column_major std430) buffer block{layout( column_major std430 offset=0) buffer runtime-sized array of 4-component vector of uint result})
0:? 'gl_VertexID' ( gl_VertexId int VertexId)
0:? 'gl_InstanceID' ( gl_InstanceId int InstanceId)

Loading

0 comments on commit 5125eb5

Please sign in to comment.