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

100
Test/baseResults/hlsl.gather.basic.dx10.frag.out
View File

@@ -87,7 +87,7 @@ gl_FragCoord origin is upper left
0:45 1.000000
0:47 Sequence
0:47 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:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:47 Branch: Return
0:? Linker Objects
@@ -199,7 +199,7 @@ gl_FragCoord origin is upper left
0:45 1.000000
0:47 Sequence
0:47 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:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:47 Branch: Return
0:? Linker Objects
@@ -221,13 +221,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 123
// Id's are bound by 124
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 100
EntryPoint Fragment 4 "main" 101
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval20"
@@ -247,15 +247,18 @@ gl_FragCoord origin is upper left
MemberName 90(PS_OUTPUT) 0 "Color"
MemberName 90(PS_OUTPUT) 1 "Depth"
Name 92 "psout"
Name 100 "@entryPointOutput"
Name 103 "g_sSamp2d"
Name 106 "g_tTex1df4a"
Name 107 "g_tTex1df4"
Name 110 "g_tTex1di4"
Name 113 "g_tTex1du4"
Name 116 "g_tTex3df4"
Name 119 "g_tTex3di4"
Name 122 "g_tTex3du4"
Name 99 "PS_OUTPUT"
MemberName 99(PS_OUTPUT) 0 "Color"
MemberName 99(PS_OUTPUT) 1 "Depth"
Name 101 "@entryPointOutput"
Name 104 "g_sSamp2d"
Name 107 "g_tTex1df4a"
Name 108 "g_tTex1df4"
Name 111 "g_tTex1di4"
Name 114 "g_tTex1du4"
Name 117 "g_tTex3df4"
Name 120 "g_tTex3di4"
Name 123 "g_tTex3du4"
Decorate 12(g_tTex2df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 16(g_sSamp) Binding 0
@@ -265,16 +268,18 @@ gl_FragCoord origin is upper left
Decorate 70(g_tTexcdi4) DescriptorSet 0
Decorate 80(g_tTexcdu4) DescriptorSet 0
MemberDecorate 90(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 103(g_sSamp2d) DescriptorSet 0
Decorate 106(g_tTex1df4a) DescriptorSet 0
Decorate 106(g_tTex1df4a) Binding 1
Decorate 107(g_tTex1df4) DescriptorSet 0
Decorate 107(g_tTex1df4) Binding 0
Decorate 110(g_tTex1di4) DescriptorSet 0
Decorate 113(g_tTex1du4) DescriptorSet 0
Decorate 116(g_tTex3df4) DescriptorSet 0
Decorate 119(g_tTex3di4) DescriptorSet 0
Decorate 122(g_tTex3du4) DescriptorSet 0
MemberDecorate 99(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 101(@entryPointOutput) Location 0
Decorate 104(g_sSamp2d) DescriptorSet 0
Decorate 107(g_tTex1df4a) DescriptorSet 0
Decorate 107(g_tTex1df4a) Binding 1
Decorate 108(g_tTex1df4) DescriptorSet 0
Decorate 108(g_tTex1df4) Binding 0
Decorate 111(g_tTex1di4) DescriptorSet 0
Decorate 114(g_tTex1du4) DescriptorSet 0
Decorate 117(g_tTex3df4) DescriptorSet 0
Decorate 120(g_tTex3di4) DescriptorSet 0
Decorate 123(g_tTex3du4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -337,28 +342,29 @@ gl_FragCoord origin is upper left
94: 7(fvec4) ConstantComposite 93 93 93 93
96: 24(int) Constant 1
97: TypePointer Function 6(float)
99: TypePointer Output 90(PS_OUTPUT)
100(@entryPointOutput): 99(ptr) Variable Output
103(g_sSamp2d): 15(ptr) Variable UniformConstant
104: TypeImage 6(float) 1D sampled format:Unknown
105: TypePointer UniformConstant 104
106(g_tTex1df4a): 105(ptr) Variable UniformConstant
107(g_tTex1df4): 105(ptr) Variable UniformConstant
108: TypeImage 24(int) 1D sampled format:Unknown
109: TypePointer UniformConstant 108
110(g_tTex1di4): 109(ptr) Variable UniformConstant
111: TypeImage 41(int) 1D sampled format:Unknown
112: TypePointer UniformConstant 111
113(g_tTex1du4): 112(ptr) Variable UniformConstant
114: TypeImage 6(float) 3D sampled format:Unknown
115: TypePointer UniformConstant 114
116(g_tTex3df4): 115(ptr) Variable UniformConstant
117: TypeImage 24(int) 3D sampled format:Unknown
118: TypePointer UniformConstant 117
119(g_tTex3di4): 118(ptr) Variable UniformConstant
120: TypeImage 41(int) 3D sampled format:Unknown
121: TypePointer UniformConstant 120
122(g_tTex3du4): 121(ptr) Variable UniformConstant
99(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
100: TypePointer Output 99(PS_OUTPUT)
101(@entryPointOutput): 100(ptr) Variable Output
104(g_sSamp2d): 15(ptr) Variable UniformConstant
105: TypeImage 6(float) 1D sampled format:Unknown
106: TypePointer UniformConstant 105
107(g_tTex1df4a): 106(ptr) Variable UniformConstant
108(g_tTex1df4): 106(ptr) Variable UniformConstant
109: TypeImage 24(int) 1D sampled format:Unknown
110: TypePointer UniformConstant 109
111(g_tTex1di4): 110(ptr) Variable UniformConstant
112: TypeImage 41(int) 1D sampled format:Unknown
113: TypePointer UniformConstant 112
114(g_tTex1du4): 113(ptr) Variable UniformConstant
115: TypeImage 6(float) 3D sampled format:Unknown
116: TypePointer UniformConstant 115
117(g_tTex3df4): 116(ptr) Variable UniformConstant
118: TypeImage 24(int) 3D sampled format:Unknown
119: TypePointer UniformConstant 118
120(g_tTex3di4): 119(ptr) Variable UniformConstant
121: TypeImage 41(int) 3D sampled format:Unknown
122: TypePointer UniformConstant 121
123(g_tTex3du4): 122(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval20): 8(ptr) Variable Function
@@ -402,7 +408,7 @@ gl_FragCoord origin is upper left
Store 95 94
98: 97(ptr) AccessChain 92(psout) 96
Store 98 93
101:90(PS_OUTPUT) Load 92(psout)
Store 100(@entryPointOutput) 101
102:90(PS_OUTPUT) Load 92(psout)
Store 101(@entryPointOutput) 102
Return
FunctionEnd