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

44
Test/baseResults/hlsl.sample.basic.dx10.frag.out
View File

@@ -233,7 +233,7 @@ gl_FragCoord origin is upper left
0:87 1.000000
0:89 Sequence
0:89 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:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:89 Branch: Return
0:? Linker Objects
@@ -490,7 +490,7 @@ gl_FragCoord origin is upper left
0:87 1.000000
0:89 Sequence
0:89 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:89 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:89 Branch: Return
0:? Linker Objects
@@ -513,13 +513,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 186
// Id's are bound by 187
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 180
EntryPoint Fragment 4 "main" 181
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 7 "MemberTest"
@@ -565,10 +565,13 @@ gl_FragCoord origin is upper left
MemberName 171(PS_OUTPUT) 0 "Color"
MemberName 171(PS_OUTPUT) 1 "Depth"
Name 173 "psout"
Name 180 "@entryPointOutput"
Name 183 "g_sSamp2d"
Name 184 "g_sSamp2D_b"
Name 185 "g_tTex1df4a"
Name 179 "PS_OUTPUT"
MemberName 179(PS_OUTPUT) 0 "Color"
MemberName 179(PS_OUTPUT) 1 "Depth"
Name 181 "@entryPointOutput"
Name 184 "g_sSamp2d"
Name 185 "g_sSamp2D_b"
Name 186 "g_tTex1df4a"
Decorate 41(g_tTex1df4) DescriptorSet 0
Decorate 41(g_tTex1df4) Binding 0
Decorate 45(g_sSamp) DescriptorSet 0
@@ -585,10 +588,12 @@ gl_FragCoord origin is upper left
Decorate 156(g_tTexcdi4) DescriptorSet 0
Decorate 165(g_tTexcdu4) DescriptorSet 0
MemberDecorate 171(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 183(g_sSamp2d) DescriptorSet 0
Decorate 184(g_sSamp2D_b) DescriptorSet 0
Decorate 185(g_tTex1df4a) DescriptorSet 0
Decorate 185(g_tTex1df4a) Binding 1
MemberDecorate 179(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 181(@entryPointOutput) Location 0
Decorate 184(g_sSamp2d) DescriptorSet 0
Decorate 185(g_sSamp2D_b) DescriptorSet 0
Decorate 186(g_tTex1df4a) DescriptorSet 0
Decorate 186(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
@@ -688,11 +693,12 @@ gl_FragCoord origin is upper left
174: 35(float) Constant 1065353216
175: 36(fvec4) ConstantComposite 174 174 174 174
177: TypePointer Function 35(float)
179: TypePointer Output 171(PS_OUTPUT)
180(@entryPointOutput): 179(ptr) Variable Output
183(g_sSamp2d): 44(ptr) Variable UniformConstant
184(g_sSamp2D_b): 44(ptr) Variable UniformConstant
185(g_tTex1df4a): 40(ptr) Variable UniformConstant
179(PS_OUTPUT): TypeStruct 36(fvec4) 35(float)
180: TypePointer Output 179(PS_OUTPUT)
181(@entryPointOutput): 180(ptr) Variable Output
184(g_sSamp2d): 44(ptr) Variable UniformConstant
185(g_sSamp2D_b): 44(ptr) Variable UniformConstant
186(g_tTex1df4a): 40(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(mtest): 8(ptr) Variable Function
@@ -797,7 +803,7 @@ gl_FragCoord origin is upper left
Store 176 175
178: 177(ptr) AccessChain 173(psout) 10
Store 178 174
181:171(PS_OUTPUT) Load 173(psout)
Store 180(@entryPointOutput) 181
182:171(PS_OUTPUT) Load 173(psout)
Store 181(@entryPointOutput) 182
Return
FunctionEnd