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

Merge pull request #755 from steve-lunarg/sb-orderfix

Browse Source 
HLSL: Fix ordering defect if global SB decl after fn param
This commit is contained in:
John Kessenich 2017-03-06 17:56:56 -07:00 committed by GitHub
commit 621c0e3d69
4 changed files with 98 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
Test/baseResults/hlsl.structbuffer.fn.frag.out
View File

@ -2,59 +2,59 @@ hlsl.structbuffer.fn.frag
Shader version: 450 Shader version: 450
gl_FragCoord origin is upper left gl_FragCoord origin is upper left
0:? Sequence 0:? Sequence
0:9 Function Definition: get(block--vu4[0]1;u1; (temp 4-component vector of uint) 0:5 Function Definition: get(block--vu4[0]1;u1; (temp 4-component vector of uint)
0:9 Function Parameters: 0:5 Function Parameters:
0:9 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:5 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:9 'bufferOffset' (in uint) 0:5 'bufferOffset' (in uint)
0:? Sequence 0:? Sequence
0:10 Branch: Return with expression 0:6 Branch: Return with expression
0:10 indirect index (layout(row_major std430 ) buffer 4-component vector of uint) 0:6 indirect index (layout(row_major std430 ) buffer 4-component vector of uint)
0:10 @data: direct index for structure (layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint) 0:6 @data: direct index for structure (layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint)
0:10 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:6 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:10 Constant: 0:6 Constant:
0:10 0 (const uint) 0:6 0 (const uint)
0:6 'bufferOffset' (in uint)
0:10 Function Definition: set(block--vu4[0]1;u1;vu4; (temp void)
0:10 Function Parameters:
0:10 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:10 'bufferOffset' (in uint) 0:10 'bufferOffset' (in uint)
0:14 Function Definition: set(block--vu4[0]1;u1;vu4; (temp void) 0:10 'data' (in 4-component vector of uint)
0:14 Function Parameters:
0:14 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:14 'bufferOffset' (in uint)
0:14 'data' (in 4-component vector of uint)
0:? Sequence 0:? Sequence
0:15 move second child to first child (temp 4-component vector of uint) 0:11 move second child to first child (temp 4-component vector of uint)
0:15 indirect index (layout(row_major std430 ) buffer 4-component vector of uint) 0:11 indirect index (buffer 4-component vector of uint)
0:15 @data: direct index for structure (layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint) 0:11 @data: direct index for structure (buffer implicitly-sized array of 4-component vector of uint)
0:15 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:11 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:15 Constant: 0:11 Constant:
0:15 0 (const uint) 0:11 0 (const uint)
0:15 'bufferOffset' (in uint) 0:11 'bufferOffset' (in uint)
0:15 'data' (in 4-component vector of uint) 0:11 'data' (in 4-component vector of uint)
0:19 Function Definition: @main(u1; (temp 4-component vector of float) 0:20 Function Definition: @main(u1; (temp 4-component vector of float)
0:19 Function Parameters: 0:20 Function Parameters:
0:19 'pos' (in uint) 0:20 'pos' (in uint)
0:? Sequence 0:? Sequence
0:20 Function Call: set(block--vu4[0]1;u1;vu4; (temp void) 0:21 Function Call: set(block--vu4[0]1;u1;vu4; (temp void)
0:20 'sbuf2' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:21 'sbuf2' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:20 Constant: 0:21 Constant:
0:20 2 (const uint) 0:21 2 (const uint)
0:20 Function Call: get(block--vu4[0]1;u1; (temp 4-component vector of uint) 0:21 Function Call: get(block--vu4[0]1;u1; (temp 4-component vector of uint)
0:20 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:21 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:20 Constant: 0:21 Constant:
0:20 3 (const uint) 0:21 3 (const uint)
0:22 Branch: Return with expression 0:23 Branch: Return with expression
0:22 Constant: 0:23 Constant:
0:22 0.000000 0:23 0.000000
0:22 0.000000 0:23 0.000000
0:22 0.000000 0:23 0.000000
0:22 0.000000 0:23 0.000000
0:19 Function Definition: main( (temp void) 0:20 Function Definition: main( (temp void)
0:19 Function Parameters: 0:20 Function Parameters:
0:? Sequence 0:? Sequence
0:19 move second child to first child (temp uint) 0:20 move second child to first child (temp uint)
0:? 'pos' (temp uint) 0:? 'pos' (temp uint)
0:? 'pos' (layout(location=0 ) in uint) 0:? 'pos' (layout(location=0 ) in uint)
0:19 move second child to first child (temp 4-component vector of float) 0:20 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:19 Function Call: @main(u1; (temp 4-component vector of float) 0:20 Function Call: @main(u1; (temp 4-component vector of float)
0:? 'pos' (temp uint) 0:? 'pos' (temp uint)
0:? Linker Objects 0:? Linker Objects
0:? 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:? 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
@ -70,59 +70,59 @@ Linked fragment stage:
Shader version: 450 Shader version: 450
gl_FragCoord origin is upper left gl_FragCoord origin is upper left
0:? Sequence 0:? Sequence
0:9 Function Definition: get(block--vu4[0]1;u1; (temp 4-component vector of uint) 0:5 Function Definition: get(block--vu4[0]1;u1; (temp 4-component vector of uint)
0:9 Function Parameters: 0:5 Function Parameters:
0:9 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:5 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:9 'bufferOffset' (in uint) 0:5 'bufferOffset' (in uint)
0:? Sequence 0:? Sequence
0:10 Branch: Return with expression 0:6 Branch: Return with expression
0:10 indirect index (layout(row_major std430 ) buffer 4-component vector of uint) 0:6 indirect index (layout(row_major std430 ) buffer 4-component vector of uint)
0:10 @data: direct index for structure (layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint) 0:6 @data: direct index for structure (layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint)
0:10 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:6 'sb' (layout(row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:10 Constant: 0:6 Constant:
0:10 0 (const uint) 0:6 0 (const uint)
0:6 'bufferOffset' (in uint)
0:10 Function Definition: set(block--vu4[0]1;u1;vu4; (temp void)
0:10 Function Parameters:
0:10 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:10 'bufferOffset' (in uint) 0:10 'bufferOffset' (in uint)
0:14 Function Definition: set(block--vu4[0]1;u1;vu4; (temp void) 0:10 'data' (in 4-component vector of uint)
0:14 Function Parameters:
0:14 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:14 'bufferOffset' (in uint)
0:14 'data' (in 4-component vector of uint)
0:? Sequence 0:? Sequence
0:15 move second child to first child (temp 4-component vector of uint) 0:11 move second child to first child (temp 4-component vector of uint)
0:15 indirect index (layout(row_major std430 ) buffer 4-component vector of uint) 0:11 indirect index (buffer 4-component vector of uint)
0:15 @data: direct index for structure (layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint) 0:11 @data: direct index for structure (buffer implicitly-sized array of 4-component vector of uint)
0:15 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:11 'sb' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:15 Constant: 0:11 Constant:
0:15 0 (const uint) 0:11 0 (const uint)
0:15 'bufferOffset' (in uint) 0:11 'bufferOffset' (in uint)
0:15 'data' (in 4-component vector of uint) 0:11 'data' (in 4-component vector of uint)
0:19 Function Definition: @main(u1; (temp 4-component vector of float) 0:20 Function Definition: @main(u1; (temp 4-component vector of float)
0:19 Function Parameters: 0:20 Function Parameters:
0:19 'pos' (in uint) 0:20 'pos' (in uint)
0:? Sequence 0:? Sequence
0:20 Function Call: set(block--vu4[0]1;u1;vu4; (temp void) 0:21 Function Call: set(block--vu4[0]1;u1;vu4; (temp void)
0:20 'sbuf2' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:21 'sbuf2' (layout(row_major std430 ) buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:20 Constant: 0:21 Constant:
0:20 2 (const uint) 0:21 2 (const uint)
0:20 Function Call: get(block--vu4[0]1;u1; (temp 4-component vector of uint) 0:21 Function Call: get(block--vu4[0]1;u1; (temp 4-component vector of uint)
0:20 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:21 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})
0:20 Constant: 0:21 Constant:
0:20 3 (const uint) 0:21 3 (const uint)
0:22 Branch: Return with expression 0:23 Branch: Return with expression
0:22 Constant: 0:23 Constant:
0:22 0.000000 0:23 0.000000
0:22 0.000000 0:23 0.000000
0:22 0.000000 0:23 0.000000
0:22 0.000000 0:23 0.000000
0:19 Function Definition: main( (temp void) 0:20 Function Definition: main( (temp void)
0:19 Function Parameters: 0:20 Function Parameters:
0:? Sequence 0:? Sequence
0:19 move second child to first child (temp uint) 0:20 move second child to first child (temp uint)
0:? 'pos' (temp uint) 0:? 'pos' (temp uint)
0:? 'pos' (layout(location=0 ) in uint) 0:? 'pos' (layout(location=0 ) in uint)
0:19 move second child to first child (temp 4-component vector of float) 0:20 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float) 0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:19 Function Call: @main(u1; (temp 4-component vector of float) 0:20 Function Call: @main(u1; (temp 4-component vector of float)
0:? 'pos' (temp uint) 0:? 'pos' (temp uint)
0:? Linker Objects 0:? Linker Objects
0:? 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data}) 0:? 'sbuf' (layout(binding=10 row_major std430 ) readonly buffer block{layout(row_major std430 ) buffer implicitly-sized array of 4-component vector of uint @data})

9
Test/hlsl.structbuffer.fn.frag
View File

@ -1,9 +1,5 @@
StructuredBuffer<uint4> sbuf : register(t10); StructuredBuffer<uint4> sbuf : register(t10);
RWStructuredBuffer<uint4> sbuf2;
// Not shared, because of type difference.
StructuredBuffer<uint3> sbuf3 : register(t12);
uint4 get(in StructuredBuffer<uint4> sb, uint bufferOffset) uint4 get(in StructuredBuffer<uint4> sb, uint bufferOffset)
{ {
@ -15,6 +11,11 @@ void set(in RWStructuredBuffer<uint4> sb, uint bufferOffset, uint4 data)
sb[bufferOffset] = data; sb[bufferOffset] = data;
} }
RWStructuredBuffer<uint4> sbuf2;
// Not shared, because of type difference.
StructuredBuffer<uint3> sbuf3 : register(t12);
float4 main(uint pos : FOO) : SV_Target0 float4 main(uint pos : FOO) : SV_Target0
{ {
set(sbuf2, 2, get(sbuf, 3)); set(sbuf2, 2, get(sbuf, 3));

1
hlsl/hlslGrammar.cpp
View File

@ -1874,6 +1874,7 @@ bool HlslGrammar::acceptStructBufferType(TType& type)
TArraySizes unsizedArray; TArraySizes unsizedArray;
unsizedArray.addInnerSize(UnsizedArraySize); unsizedArray.addInnerSize(UnsizedArraySize);
templateType->newArraySizes(unsizedArray); templateType->newArraySizes(unsizedArray);
templateType->getQualifier().storage = storage;
// field name is canonical for all structbuffers // field name is canonical for all structbuffers
templateType->setFieldName("@data"); templateType->setFieldName("@data");

6
hlsl/hlslParseHelper.cpp
View File

@ -5223,10 +5223,6 @@ void HlslParseContext::shareStructBufferType(TType& type)
return compareQualifiers(lhs, rhs) && lhs == rhs; return compareQualifiers(lhs, rhs) && lhs == rhs;
}; };
// TString typeName;
// type.appendMangledName(typeName);
// type.setTypeName(typeName);
// This is an exhaustive O(N) search, but real world shaders have // This is an exhaustive O(N) search, but real world shaders have
// only a small number of these. // only a small number of these.
for (int idx = 0; idx < int(structBufferTypes.size()); ++idx) { for (int idx = 0; idx < int(structBufferTypes.size()); ++idx) {
@ -5241,8 +5237,6 @@ void HlslParseContext::shareStructBufferType(TType& type)
TType* typeCopy = new TType; TType* typeCopy = new TType;
typeCopy->shallowCopy(type); typeCopy->shallowCopy(type);
structBufferTypes.push_back(typeCopy); structBufferTypes.push_back(typeCopy);
// structBuffTypes.push_back(type.getWritableStruct());
} }
void HlslParseContext::paramFix(TType& type) void HlslParseContext::paramFix(TType& type)