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

Implement barrier() control-flow rules: in flow control, non-main, and post-return.

Browse Source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@29347 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich
2015-01-07 06:14:06 +00:00
parent cbc7dd979a
commit 05a62bf528
8 changed files with 426 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

112
Test/baseResults/430.comp.out
View File

@@ -3,17 +3,17 @@ Warning, version 430 is not yet complete; most version-specific features are pre
ERROR: 0:4: 'local_size' : cannot change previously set size
ERROR: 0:5: 'local_size' : too large; see gl_MaxComputeWorkGroupSize
ERROR: 0:23: 'values' : only the last member of a buffer block can be run-time sized
ERROR: 0:39: 'in' : global storage input qualifier cannot be used in a compute shader
ERROR: 0:39: 'location qualifier on input' : not supported in this stage: compute
ERROR: 0:40: 'in' : global storage input qualifier cannot be used in a compute shader
ERROR: 0:41: 'out' : global storage output qualifier cannot be used in a compute shader
ERROR: 0:44: 'shared' : cannot apply layout qualifiers to a shared variable
ERROR: 0:44: 'location' : can only appy to uniform, buffer, in, or out storage qualifiers
ERROR: 0:45: 'shared' : cannot initialize this type of qualifier
ERROR: 0:47: 'local_size' : can only apply to 'in'
ERROR: 0:47: 'local_size' : can only apply to 'in'
ERROR: 0:47: 'local_size' : can only apply to 'in'
ERROR: 0:61: 'assign' : l-value required "ro" (can't modify a readonly buffer)
ERROR: 0:43: 'in' : global storage input qualifier cannot be used in a compute shader
ERROR: 0:43: 'location qualifier on input' : not supported in this stage: compute
ERROR: 0:44: 'in' : global storage input qualifier cannot be used in a compute shader
ERROR: 0:45: 'out' : global storage output qualifier cannot be used in a compute shader
ERROR: 0:48: 'shared' : cannot apply layout qualifiers to a shared variable
ERROR: 0:48: 'location' : can only appy to uniform, buffer, in, or out storage qualifiers
ERROR: 0:49: 'shared' : cannot initialize this type of qualifier
ERROR: 0:51: 'local_size' : can only apply to 'in'
ERROR: 0:51: 'local_size' : can only apply to 'in'
ERROR: 0:51: 'local_size' : can only apply to 'in'
ERROR: 0:65: 'assign' : l-value required "ro" (can't modify a readonly buffer)
ERROR: 14 compilation errors. No code generated.
@@ -42,24 +42,33 @@ ERROR: node is still EOpNull!
0:36 Constant:
0:36 1 (const uint)
0:36 'gl_LocalInvocationIndex' (in uint)
0:59 Function Definition: foo( (void)
0:59 Function Parameters:
0:61 Sequence
0:61 move second child to first child (float)
0:61 direct index (layout(column_major shared ) float)
0:61 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:61 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:61 Constant:
0:61 1 (const int)
0:61 Constant:
0:61 2 (const int)
0:61 Constant:
0:61 4.700000
0:62 array length (int)
0:62 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:62 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:62 Constant:
0:62 1 (const int)
0:39 Test condition and select (void)
0:39 Condition
0:39 Compare Greater Than (bool)
0:39 'a' (int)
0:39 Constant:
0:39 10 (const int)
0:39 true case
0:40 Barrier (void)
0:63 Function Definition: foo( (void)
0:63 Function Parameters:
0:65 Sequence
0:65 move second child to first child (float)
0:65 direct index (layout(column_major shared ) float)
0:65 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:65 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:65 Constant:
0:65 1 (const int)
0:65 Constant:
0:65 2 (const int)
0:65 Constant:
0:65 4.700000
0:66 array length (int)
0:66 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:66 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:66 Constant:
0:66 1 (const int)
0:67 Barrier (void)
0:? Linker Objects
0:? 'gl_WorkGroupSize' (const 3-component vector of uint)
0:? 2 (const uint)
@@ -109,24 +118,33 @@ ERROR: node is still EOpNull!
0:36 Constant:
0:36 1 (const uint)
0:36 'gl_LocalInvocationIndex' (in uint)
0:59 Function Definition: foo( (void)
0:59 Function Parameters:
0:61 Sequence
0:61 move second child to first child (float)
0:61 direct index (layout(column_major shared ) float)
0:61 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:61 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:61 Constant:
0:61 1 (const int)
0:61 Constant:
0:61 2 (const int)
0:61 Constant:
0:61 4.700000
0:62 array length (int)
0:62 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:62 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:62 Constant:
0:62 1 (const int)
0:39 Test condition and select (void)
0:39 Condition
0:39 Compare Greater Than (bool)
0:39 'a' (int)
0:39 Constant:
0:39 10 (const int)
0:39 true case
0:40 Barrier (void)
0:63 Function Definition: foo( (void)
0:63 Function Parameters:
0:65 Sequence
0:65 move second child to first child (float)
0:65 direct index (layout(column_major shared ) float)
0:65 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:65 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:65 Constant:
0:65 1 (const int)
0:65 Constant:
0:65 2 (const int)
0:65 Constant:
0:65 4.700000
0:66 array length (int)
0:66 values: direct index for structure (layout(column_major shared ) buffer implicitly-sized array of float)
0:66 'ro' (layout(column_major shared ) readonly buffer block{layout(column_major shared ) buffer int value, layout(column_major shared ) buffer implicitly-sized array of float values})
0:66 Constant:
0:66 1 (const int)
0:67 Barrier (void)
0:? Linker Objects
0:? 'gl_WorkGroupSize' (const 3-component vector of uint)
0:? 2 (const uint)