Skip to content

G
glslang
Commit e3218e27 by John Kessenich
Options

HLSL: Accept layout(...) also as a post-decl. Issue #454.

parent 7735b944
Showing with 71 additions and 39 deletions
Test/baseResults/hlsl.layout.frag.out
...@@ -2,27 +2,33 @@ hlsl.layout.frag ...@@ -2,27 +2,33 @@ hlsl.layout.frag
Shader version: 450 Shader version: 450
gl_FragCoord origin is upper left gl_FragCoord origin is upper left
0:? Sequence 0:? Sequence
0:12 Function Definition: PixelShaderFunction(vf4; (global 4-component vector of float) 0:16 Function Definition: PixelShaderFunction(vf4; (global 4-component vector of float)
0:12 Function Parameters: 0:16 Function Parameters:
0:12 'input' (in 4-component vector of float) 0:16 'input' (in 4-component vector of float)
0:? Sequence 0:? Sequence
0:13 Branch: Return with expression 0:17 Branch: Return with expression
0:13 add (temp 4-component vector of float) 0:17 add (temp 4-component vector of float)
0:13 add (temp 4-component vector of float) 0:17 add (temp 4-component vector of float)
0:13 'input' (in 4-component vector of float) 0:17 add (temp 4-component vector of float)
0:13 v1: direct index for structure (layout(column_major std430 offset=16 ) buffer 4-component vector of float) 0:17 'input' (in 4-component vector of float)
0:13 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1}) 0:17 v1: direct index for structure (layout(column_major std430 offset=16 ) buffer 4-component vector of float)
0:13 Constant: 0:17 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1})
0:13 0 (const uint) 0:17 Constant:
0:13 v5: direct index for structure (layout(column_major std430 offset=0 ) buffer 4-component vector of float) 0:17 0 (const uint)
0:13 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5}) 0:17 v5: direct index for structure (layout(column_major std430 offset=0 ) buffer 4-component vector of float)
0:13 Constant: 0:17 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5})
0:13 0 (const uint) 0:17 Constant:
0:17 0 (const uint)
0:17 v1PostLayout: direct index for structure (layout(column_major std430 offset=16 ) buffer 4-component vector of float)
0:17 'anon@2' (layout(set=4 binding=7 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1PostLayout})
0:17 Constant:
0:17 0 (const uint)
0:? Linker Objects 0:? Linker Objects
0:? 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1}) 0:? 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1})
0:? 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5}) 0:? 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5})
0:? 'specConst' (specialization-constant const int) 0:? 'specConst' (specialization-constant const int)
0:? 10 (const int) 0:? 10 (const int)
0:? 'anon@2' (layout(set=4 binding=7 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1PostLayout})
Linked fragment stage: Linked fragment stage:
...@@ -31,31 +37,37 @@ Linked fragment stage: ...@@ -31,31 +37,37 @@ 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:12 Function Definition: PixelShaderFunction(vf4; (global 4-component vector of float) 0:16 Function Definition: PixelShaderFunction(vf4; (global 4-component vector of float)
0:12 Function Parameters: 0:16 Function Parameters:
0:12 'input' (in 4-component vector of float) 0:16 'input' (in 4-component vector of float)
0:? Sequence 0:? Sequence
0:13 Branch: Return with expression 0:17 Branch: Return with expression
0:13 add (temp 4-component vector of float) 0:17 add (temp 4-component vector of float)
0:13 add (temp 4-component vector of float) 0:17 add (temp 4-component vector of float)
0:13 'input' (in 4-component vector of float) 0:17 add (temp 4-component vector of float)
0:13 v1: direct index for structure (layout(column_major std430 offset=16 ) buffer 4-component vector of float) 0:17 'input' (in 4-component vector of float)
0:13 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1}) 0:17 v1: direct index for structure (layout(column_major std430 offset=16 ) buffer 4-component vector of float)
0:13 Constant: 0:17 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1})
0:13 0 (const uint) 0:17 Constant:
0:13 v5: direct index for structure (layout(column_major std430 offset=0 ) buffer 4-component vector of float) 0:17 0 (const uint)
0:13 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5}) 0:17 v5: direct index for structure (layout(column_major std430 offset=0 ) buffer 4-component vector of float)
0:13 Constant: 0:17 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5})
0:13 0 (const uint) 0:17 Constant:
0:17 0 (const uint)
0:17 v1PostLayout: direct index for structure (layout(column_major std430 offset=16 ) buffer 4-component vector of float)
0:17 'anon@2' (layout(set=4 binding=7 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1PostLayout})
0:17 Constant:
0:17 0 (const uint)
0:? Linker Objects 0:? Linker Objects
0:? 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1}) 0:? 'anon@0' (layout(set=3 binding=5 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1})
0:? 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5}) 0:? 'anon@1' (layout(column_major std430 push_constant ) buffer block{layout(column_major std430 offset=0 ) buffer 4-component vector of float v5})
0:? 'specConst' (specialization-constant const int) 0:? 'specConst' (specialization-constant const int)
0:? 10 (const int) 0:? 10 (const int)
0:? 'anon@2' (layout(set=4 binding=7 column_major std430 ) buffer block{layout(column_major std430 offset=16 ) buffer 4-component vector of float v1PostLayout})
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 33 // Id's are bound by 39
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
...@@ -71,13 +83,20 @@ gl_FragCoord origin is upper left ...@@ -71,13 +83,20 @@ gl_FragCoord origin is upper left
Name 23 "" Name 23 ""
MemberName 23 0 "v5" MemberName 23 0 "v5"
Name 25 "" Name 25 ""
Name 30 ""
MemberName 30 0 "v1PostLayout"
Name 32 ""
MemberDecorate 14 0 Offset 16 MemberDecorate 14 0 Offset 16
Decorate 14 BufferBlock Decorate 14 BufferBlock
Decorate 16 DescriptorSet 3 Decorate 16 DescriptorSet 3
Decorate 16 Binding 5 Decorate 16 Binding 5
MemberDecorate 23 0 Offset 0 MemberDecorate 23 0 Offset 0
Decorate 23 BufferBlock Decorate 23 BufferBlock
Decorate 32 SpecId 17 MemberDecorate 30 0 Offset 16
Decorate 30 BufferBlock
Decorate 32 DescriptorSet 4
Decorate 32 Binding 7
Decorate 38 SpecId 17
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
...@@ -94,7 +113,10 @@ gl_FragCoord origin is upper left ...@@ -94,7 +113,10 @@ gl_FragCoord origin is upper left
24: TypePointer PushConstant 23(struct) 24: TypePointer PushConstant 23(struct)
25: 24(ptr) Variable PushConstant 25: 24(ptr) Variable PushConstant
26: TypePointer PushConstant 7(fvec4) 26: TypePointer PushConstant 7(fvec4)
32: 17(int) SpecConstant 10 30: TypeStruct 7(fvec4)
31: TypePointer Uniform 30(struct)
32: 31(ptr) Variable Uniform
38: 17(int) SpecConstant 10
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
FunctionEnd FunctionEnd
...@@ -108,5 +130,8 @@ gl_FragCoord origin is upper left ...@@ -108,5 +130,8 @@ gl_FragCoord origin is upper left
27: 26(ptr) AccessChain 25 18 27: 26(ptr) AccessChain 25 18
28: 7(fvec4) Load 27 28: 7(fvec4) Load 27
29: 7(fvec4) FAdd 22 28 29: 7(fvec4) FAdd 22 28
ReturnValue 29 33: 19(ptr) AccessChain 32 18
34: 7(fvec4) Load 33
35: 7(fvec4) FAdd 29 34
ReturnValue 35
FunctionEnd FunctionEnd
Test/hlsl.layout.frag
...@@ -8,7 +8,11 @@ layout(push_constant) tbuffer tbufName2 { ...@@ -8,7 +8,11 @@ layout(push_constant) tbuffer tbufName2 {
layout(constant_id=17) const int specConst = 10; layout(constant_id=17) const int specConst = 10;
tbuffer tbufName2 : layout(set=4,binding=7) {
layout(offset = 16) float4 v1PostLayout;
};
float4 PixelShaderFunction(float4 input) : COLOR0 float4 PixelShaderFunction(float4 input) : COLOR0
{ {
return input + v1 + v5; return input + v1 + v5 + v1PostLayout;
} }
glslang/Include/revision.h
...@@ -2,5 +2,5 @@ ...@@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1469" #define GLSLANG_REVISION "Overload400-PrecQual.1470"
#define GLSLANG_DATE "05-Sep-2016" #define GLSLANG_DATE "05-Sep-2016"
hlsl/hlslGrammar.cpp
...@@ -521,7 +521,7 @@ bool HlslGrammar::acceptQualifier(TQualifier& qualifier) ...@@ -521,7 +521,7 @@ bool HlslGrammar::acceptQualifier(TQualifier& qualifier)
} }
// layout_qualifier_list // layout_qualifier_list
// : LEFT_PAREN layout_qualifier COMMA layout_qualifier ... RIGHT_PAREN // : LAYOUT LEFT_PAREN layout_qualifier COMMA layout_qualifier ... RIGHT_PAREN
// //
// layout_qualifier // layout_qualifier
// : identifier // : identifier
...@@ -2594,6 +2594,7 @@ void HlslGrammar::acceptArraySpecifier(TArraySizes*& arraySizes) ...@@ -2594,6 +2594,7 @@ void HlslGrammar::acceptArraySpecifier(TArraySizes*& arraySizes)
// : COLON semantic // optional // : COLON semantic // optional
// COLON PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN // optional // COLON PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN // optional
// COLON REGISTER LEFT_PAREN [shader_profile,] Type#[subcomp]opt RIGHT_PAREN // optional // COLON REGISTER LEFT_PAREN [shader_profile,] Type#[subcomp]opt RIGHT_PAREN // optional
// COLON LAYOUT layout_qualifier_list
// annotations // optional // annotations // optional
// //
void HlslGrammar::acceptPostDecls(TQualifier& qualifier) void HlslGrammar::acceptPostDecls(TQualifier& qualifier)
...@@ -2602,7 +2603,9 @@ void HlslGrammar::acceptPostDecls(TQualifier& qualifier) ...@@ -2602,7 +2603,9 @@ void HlslGrammar::acceptPostDecls(TQualifier& qualifier)
// COLON // COLON
if (acceptTokenClass(EHTokColon)) { if (acceptTokenClass(EHTokColon)) {
HlslToken idToken; HlslToken idToken;
if (acceptTokenClass(EHTokPackOffset)) { if (peekTokenClass(EHTokLayout))
acceptLayoutQualifierList(qualifier);
else if (acceptTokenClass(EHTokPackOffset)) {
// PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN // PACKOFFSET LEFT_PAREN c[Subcomponent][.component] RIGHT_PAREN
if (! acceptTokenClass(EHTokLeftParen)) { if (! acceptTokenClass(EHTokLeftParen)) {
expected("("); expected("(");
...@@ -2626,7 +2629,7 @@ void HlslGrammar::acceptPostDecls(TQualifier& qualifier) ...@@ -2626,7 +2629,7 @@ void HlslGrammar::acceptPostDecls(TQualifier& qualifier)
} }
parseContext.handlePackOffset(locationToken.loc, qualifier, *locationToken.string, componentToken.string); parseContext.handlePackOffset(locationToken.loc, qualifier, *locationToken.string, componentToken.string);
} else if (! acceptIdentifier(idToken)) { } else if (! acceptIdentifier(idToken)) {
expected("semantic or packoffset or register"); expected("layout, semantic, packoffset, or register");
return; return;
} else if (*idToken.string == "register") { } else if (*idToken.string == "register") {
// REGISTER LEFT_PAREN [shader_profile,] Type#[subcomp]opt RIGHT_PAREN // REGISTER LEFT_PAREN [shader_profile,] Type#[subcomp]opt RIGHT_PAREN
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment