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

32
Test/baseResults/hlsl.samplelevel.array.dx10.frag.out
View File

@@ -141,7 +141,7 @@ gl_FragCoord origin is upper left
0:40 1.000000
0:42 Sequence
0:42 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:42 Branch: Return
0:? Linker Objects
@@ -303,7 +303,7 @@ gl_FragCoord origin is upper left
0:40 1.000000
0:42 Sequence
0:42 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:42 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:42 Branch: Return
0:? Linker Objects
@@ -321,14 +321,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 135
// Id's are bound by 136
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 131
EntryPoint Fragment 4 "main" 132
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -354,8 +354,11 @@ gl_FragCoord origin is upper left
MemberName 121(PS_OUTPUT) 0 "Color"
MemberName 121(PS_OUTPUT) 1 "Depth"
Name 123 "psout"
Name 131 "@entryPointOutput"
Name 134 "g_tTex1df4"
Name 130 "PS_OUTPUT"
MemberName 130(PS_OUTPUT) 0 "Color"
MemberName 130(PS_OUTPUT) 1 "Depth"
Name 132 "@entryPointOutput"
Name 135 "g_tTex1df4"
Decorate 12(g_tTex1df4a) DescriptorSet 0
Decorate 12(g_tTex1df4a) Binding 1
Decorate 16(g_sSamp) DescriptorSet 0
@@ -369,8 +372,10 @@ gl_FragCoord origin is upper left
Decorate 101(g_tTexcdi4a) DescriptorSet 0
Decorate 111(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 121(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 134(g_tTex1df4) DescriptorSet 0
Decorate 134(g_tTex1df4) Binding 0
MemberDecorate 130(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 132(@entryPointOutput) Location 0
Decorate 135(g_tTex1df4) DescriptorSet 0
Decorate 135(g_tTex1df4) Binding 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -449,9 +454,10 @@ gl_FragCoord origin is upper left
125: 7(fvec4) ConstantComposite 118 118 118 118
127: 26(int) Constant 1
128: TypePointer Function 6(float)
130: TypePointer Output 121(PS_OUTPUT)
131(@entryPointOutput): 130(ptr) Variable Output
134(g_tTex1df4): 11(ptr) Variable UniformConstant
130(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
131: TypePointer Output 130(PS_OUTPUT)
132(@entryPointOutput): 131(ptr) Variable Output
135(g_tTex1df4): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -513,7 +519,7 @@ gl_FragCoord origin is upper left
Store 126 125
129: 128(ptr) AccessChain 123(psout) 127
Store 129 118
132:121(PS_OUTPUT) Load 123(psout)
Store 131(@entryPointOutput) 132
133:121(PS_OUTPUT) Load 123(psout)
Store 132(@entryPointOutput) 133
Return
FunctionEnd