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

64
Test/baseResults/hlsl.gather.offsetarray.dx10.frag.out
View File

@@ -66,7 +66,7 @@ gl_FragCoord origin is upper left
0:33 1.000000
0:35 Sequence
0:35 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:35 Branch: Return
0:? Linker Objects
@@ -150,7 +150,7 @@ gl_FragCoord origin is upper left
0:33 1.000000
0:35 Sequence
0:35 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:35 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:35 Branch: Return
0:? Linker Objects
@@ -165,13 +165,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 85
// Id's are bound by 86
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 72
EntryPoint Fragment 4 "main" 73
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval20"
@@ -185,23 +185,28 @@ gl_FragCoord origin is upper left
MemberName 63(PS_OUTPUT) 0 "Color"
MemberName 63(PS_OUTPUT) 1 "Depth"
Name 65 "psout"
Name 72 "@entryPointOutput"
Name 77 "g_tTex1df4a"
Name 78 "g_tTex1df4"
Name 81 "g_tTex1di4"
Name 84 "g_tTex1du4"
Name 71 "PS_OUTPUT"
MemberName 71(PS_OUTPUT) 0 "Color"
MemberName 71(PS_OUTPUT) 1 "Depth"
Name 73 "@entryPointOutput"
Name 78 "g_tTex1df4a"
Name 79 "g_tTex1df4"
Name 82 "g_tTex1di4"
Name 85 "g_tTex1du4"
Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0
Decorate 36(g_tTex2di4) DescriptorSet 0
Decorate 51(g_tTex2du4) DescriptorSet 0
MemberDecorate 63(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 77(g_tTex1df4a) DescriptorSet 0
Decorate 77(g_tTex1df4a) Binding 1
Decorate 78(g_tTex1df4) DescriptorSet 0
Decorate 78(g_tTex1df4) Binding 0
Decorate 81(g_tTex1di4) DescriptorSet 0
Decorate 84(g_tTex1du4) DescriptorSet 0
MemberDecorate 71(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 73(@entryPointOutput) Location 0
Decorate 78(g_tTex1df4a) DescriptorSet 0
Decorate 78(g_tTex1df4a) Binding 1
Decorate 79(g_tTex1df4) DescriptorSet 0
Decorate 79(g_tTex1df4) Binding 0
Decorate 82(g_tTex1di4) DescriptorSet 0
Decorate 85(g_tTex1du4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -251,18 +256,19 @@ gl_FragCoord origin is upper left
66: 6(float) Constant 1065353216
67: 7(fvec4) ConstantComposite 66 66 66 66
69: TypePointer Function 6(float)
71: TypePointer Output 63(PS_OUTPUT)
72(@entryPointOutput): 71(ptr) Variable Output
75: TypeImage 6(float) 1D array sampled format:Unknown
76: TypePointer UniformConstant 75
77(g_tTex1df4a): 76(ptr) Variable UniformConstant
78(g_tTex1df4): 76(ptr) Variable UniformConstant
79: TypeImage 25(int) 1D array sampled format:Unknown
80: TypePointer UniformConstant 79
81(g_tTex1di4): 80(ptr) Variable UniformConstant
82: TypeImage 45(int) 1D array sampled format:Unknown
83: TypePointer UniformConstant 82
84(g_tTex1du4): 83(ptr) Variable UniformConstant
71(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
72: TypePointer Output 71(PS_OUTPUT)
73(@entryPointOutput): 72(ptr) Variable Output
76: TypeImage 6(float) 1D array sampled format:Unknown
77: TypePointer UniformConstant 76
78(g_tTex1df4a): 77(ptr) Variable UniformConstant
79(g_tTex1df4): 77(ptr) Variable UniformConstant
80: TypeImage 25(int) 1D array sampled format:Unknown
81: TypePointer UniformConstant 80
82(g_tTex1di4): 81(ptr) Variable UniformConstant
83: TypeImage 45(int) 1D array sampled format:Unknown
84: TypePointer UniformConstant 83
85(g_tTex1du4): 84(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval20): 8(ptr) Variable Function
@@ -288,7 +294,7 @@ gl_FragCoord origin is upper left
Store 68 67
70: 69(ptr) AccessChain 65(psout) 27
Store 70 66
73:63(PS_OUTPUT) Load 65(psout)
Store 72(@entryPointOutput) 73
74:63(PS_OUTPUT) Load 65(psout)
Store 73(@entryPointOutput) 74
Return
FunctionEnd