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

Merge pull request #2788 from alelenv/iomapper_sr_fix

Browse Source 
Skip auto decorating shader record buffer blocks with 'set' and 'binding'.
This commit is contained in:
Greg Fischer 2021-10-20 16:28:11 -06:00 committed by GitHub
commit 8020da3f18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Test/baseResults/rayQuery.rgen.out
View File

@ -28,8 +28,6 @@ rayQuery.rgen
MemberDecorate 26(block) 0 Offset 0 MemberDecorate 26(block) 0 Offset 0
MemberDecorate 26(block) 1 Offset 16 MemberDecorate 26(block) 1 Offset 16
Decorate 26(block) BufferBlock Decorate 26(block) BufferBlock
Decorate 28 DescriptorSet 0
Decorate 28 Binding 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeInt 32 0 6: TypeInt 32 0

2
Test/baseResults/spv.RayGenShader.rgen.out
View File

@ -31,8 +31,6 @@ spv.RayGenShader.rgen
MemberDecorate 37(block) 0 Offset 0 MemberDecorate 37(block) 0 Offset 0
MemberDecorate 37(block) 1 Offset 16 MemberDecorate 37(block) 1 Offset 16
Decorate 37(block) BufferBlock Decorate 37(block) BufferBlock
Decorate 39 DescriptorSet 0
Decorate 39 Binding 2
Decorate 50(accNV1) DescriptorSet 0 Decorate 50(accNV1) DescriptorSet 0
Decorate 50(accNV1) Binding 1 Decorate 50(accNV1) Binding 1
Decorate 53(payload) Location 0 Decorate 53(payload) Location 0

2
Test/baseResults/spv.RayGenShader11.rgen.out
View File

@ -30,8 +30,6 @@ spv.RayGenShader11.rgen
MemberDecorate 37(block) 0 Offset 0 MemberDecorate 37(block) 0 Offset 0
MemberDecorate 37(block) 1 Offset 16 MemberDecorate 37(block) 1 Offset 16
Decorate 37(block) Block Decorate 37(block) Block
Decorate 39 DescriptorSet 0
Decorate 39 Binding 1
Decorate 52(payload) Location 0 Decorate 52(payload) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2

2
Test/baseResults/spv.RayGenShaderArray.rgen.out
View File

@ -37,8 +37,6 @@ spv.RayGenShaderArray.rgen
MemberDecorate 34(block) 1 Offset 16 MemberDecorate 34(block) 1 Offset 16
MemberDecorate 34(block) 2 Offset 28 MemberDecorate 34(block) 2 Offset 28
Decorate 34(block) BufferBlock Decorate 34(block) BufferBlock
Decorate 36 DescriptorSet 0
Decorate 36 Binding 2
Decorate 60(accNV1) DescriptorSet 0 Decorate 60(accNV1) DescriptorSet 0
Decorate 60(accNV1) Binding 1 Decorate 60(accNV1) Binding 1
Decorate 75 DecorationNonUniformEXT Decorate 75 DecorationNonUniformEXT

2
Test/baseResults/spv.ext.RayGenSBTlayout.rgen.out
View File

@ -49,8 +49,6 @@ spv.ext.RayGenSBTlayout.rgen
MemberDecorate 36(block) 9 Offset 120 MemberDecorate 36(block) 9 Offset 120
MemberDecorate 36(block) 10 Offset 128 MemberDecorate 36(block) 10 Offset 128
Decorate 36(block) Block Decorate 36(block) Block
Decorate 38 DescriptorSet 0
Decorate 38 Binding 0
Decorate 60(payload) Location 1 Decorate 60(payload) Location 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2

2
Test/baseResults/spv.ext.RayGenSBTlayout140.rgen.out
View File

@ -49,8 +49,6 @@ spv.ext.RayGenSBTlayout140.rgen
MemberDecorate 36(block) 9 Offset 136 MemberDecorate 36(block) 9 Offset 136
MemberDecorate 36(block) 10 Offset 144 MemberDecorate 36(block) 10 Offset 144
Decorate 36(block) Block Decorate 36(block) Block
Decorate 38 DescriptorSet 0
Decorate 38 Binding 0
Decorate 60(payload) Location 1 Decorate 60(payload) Location 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2

2
Test/baseResults/spv.ext.RayGenSBTlayout430.rgen.out
View File

@ -49,8 +49,6 @@ spv.ext.RayGenSBTlayout430.rgen
MemberDecorate 36(block) 9 Offset 120 MemberDecorate 36(block) 9 Offset 120
MemberDecorate 36(block) 10 Offset 128 MemberDecorate 36(block) 10 Offset 128
Decorate 36(block) Block Decorate 36(block) Block
Decorate 38 DescriptorSet 0
Decorate 38 Binding 0
Decorate 60(payload) Location 1 Decorate 60(payload) Location 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2

2
Test/baseResults/spv.ext.RayGenSBTlayoutscalar.rgen.out
View File

@ -50,8 +50,6 @@ spv.ext.RayGenSBTlayoutscalar.rgen
MemberDecorate 36(block) 9 Offset 96 MemberDecorate 36(block) 9 Offset 96
MemberDecorate 36(block) 10 Offset 104 MemberDecorate 36(block) 10 Offset 104
Decorate 36(block) Block Decorate 36(block) Block
Decorate 38 DescriptorSet 0
Decorate 38 Binding 0
Decorate 60(payload) Location 1 Decorate 60(payload) Location 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2

2
Test/baseResults/spv.ext.RayGenShader.rgen.out
View File

@ -34,8 +34,6 @@ spv.ext.RayGenShader.rgen
MemberDecorate 38(block) 0 Offset 0 MemberDecorate 38(block) 0 Offset 0
MemberDecorate 38(block) 1 Offset 16 MemberDecorate 38(block) 1 Offset 16
Decorate 38(block) Block Decorate 38(block) Block
Decorate 40 DescriptorSet 0
Decorate 40 Binding 3
Decorate 53(payload) Location 1 Decorate 53(payload) Location 1
Decorate 54(accEXT1) DescriptorSet 0 Decorate 54(accEXT1) DescriptorSet 0
Decorate 54(accEXT1) Binding 1 Decorate 54(accEXT1) Binding 1

2
Test/baseResults/spv.ext.RayGenShader11.rgen.out
View File

@ -30,8 +30,6 @@ spv.ext.RayGenShader11.rgen
MemberDecorate 37(block) 0 Offset 0 MemberDecorate 37(block) 0 Offset 0
MemberDecorate 37(block) 1 Offset 16 MemberDecorate 37(block) 1 Offset 16
Decorate 37(block) Block Decorate 37(block) Block
Decorate 39 DescriptorSet 0
Decorate 39 Binding 1
Decorate 52(payload) Location 1 Decorate 52(payload) Location 1
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2

2
Test/baseResults/spv.ext.RayGenShaderArray.rgen.out
View File

@ -43,8 +43,6 @@ spv.ext.RayGenShaderArray.rgen
MemberDecorate 36(block) 3 Offset 32 MemberDecorate 36(block) 3 Offset 32
MemberDecorate 36(block) 4 Offset 40 MemberDecorate 36(block) 4 Offset 40
Decorate 36(block) Block Decorate 36(block) Block
Decorate 38 DescriptorSet 0
Decorate 38 Binding 2
Decorate 61(payload) Location 1 Decorate 61(payload) Location 1
Decorate 65(accEXT1) DescriptorSet 0 Decorate 65(accEXT1) DescriptorSet 0
Decorate 65(accEXT1) Binding 1 Decorate 65(accEXT1) Binding 1

2
glslang/MachineIndependent/iomapper.cpp
View File

@ -79,7 +79,7 @@ public:
target = &inputList; target = &inputList;
else if (base->getQualifier().storage == EvqVaryingOut) else if (base->getQualifier().storage == EvqVaryingOut)
target = &outputList; target = &outputList;
else if (base->getQualifier().isUniformOrBuffer() && !base->getQualifier().isPushConstant()) else if (base->getQualifier().isUniformOrBuffer() && !base->getQualifier().isPushConstant() && !base->getQualifier().isShaderRecord())
target = &uniformList; target = &uniformList;
// If a global is being visited, then we should also traverse it incase it's evaluation // If a global is being visited, then we should also traverse it incase it's evaluation
// ends up visiting inputs we want to tag as live // ends up visiting inputs we want to tag as live