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

HLSL: Start location numbering with the entry-point return value.

Browse Source 
Also, increment location numbers by the size of the objects.
This commit is contained in:
John Kessenich
2016-08-29 18:10:47 -06:00
parent a05d8b5604
commit 830b0cc98b
89 changed files with 2517 additions and 2157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
Test/baseResults/hlsl.stringtoken.frag.out
View File

@@ -17,7 +17,7 @@ gl_FragCoord origin is upper left
0:? 1.000000
0:19 Sequence
0:19 move second child to first child (temp structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color})
0:19 'psout' (temp structure{temp 4-component vector of float Color})
0:19 Branch: Return
0:? Linker Objects
@@ -46,7 +46,7 @@ gl_FragCoord origin is upper left
0:? 1.000000
0:19 Sequence
0:19 move second child to first child (temp structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color})
0:19 'psout' (temp structure{temp 4-component vector of float Color})
0:19 Branch: Return
0:? Linker Objects
@@ -55,21 +55,24 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 27
// Id's are bound by 28
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 19
EntryPoint Fragment 4 "main" 20
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "PS_OUTPUT"
MemberName 8(PS_OUTPUT) 0 "Color"
Name 10 "psout"
Name 19 "@entryPointOutput"
Name 24 "TestTexture"
Name 26 "TestUF"
Decorate 24(TestTexture) DescriptorSet 0
Name 18 "PS_OUTPUT"
MemberName 18(PS_OUTPUT) 0 "Color"
Name 20 "@entryPointOutput"
Name 25 "TestTexture"
Name 27 "TestUF"
Decorate 20(@entryPointOutput) Location 0
Decorate 25(TestTexture) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -82,19 +85,20 @@ gl_FragCoord origin is upper left
14: 6(float) Constant 1065353216
15: 7(fvec4) ConstantComposite 13 13 13 14
16: TypePointer Function 7(fvec4)
18: TypePointer Output 8(PS_OUTPUT)
19(@entryPointOutput): 18(ptr) Variable Output
22: TypeImage 6(float) 2D sampled format:Unknown
23: TypePointer UniformConstant 22
24(TestTexture): 23(ptr) Variable UniformConstant
25: TypePointer UniformConstant 7(fvec4)
26(TestUF): 25(ptr) Variable UniformConstant
18(PS_OUTPUT): TypeStruct 7(fvec4)
19: TypePointer Output 18(PS_OUTPUT)
20(@entryPointOutput): 19(ptr) Variable Output
23: TypeImage 6(float) 2D sampled format:Unknown
24: TypePointer UniformConstant 23
25(TestTexture): 24(ptr) Variable UniformConstant
26: TypePointer UniformConstant 7(fvec4)
27(TestUF): 26(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
10(psout): 9(ptr) Variable Function
17: 16(ptr) AccessChain 10(psout) 12
Store 17 15
20:8(PS_OUTPUT) Load 10(psout)
Store 19(@entryPointOutput) 20
21:8(PS_OUTPUT) Load 10(psout)
Store 20(@entryPointOutput) 21
Return
FunctionEnd