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.sample.array.dx10.frag.out
View File

@@ -123,7 +123,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
@@ -267,7 +267,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
@@ -285,14 +285,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 134
// Id's are bound by 135
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 130
EntryPoint Fragment 4 "main" 131
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -318,8 +318,11 @@ gl_FragCoord origin is upper left
MemberName 120(PS_OUTPUT) 0 "Color"
MemberName 120(PS_OUTPUT) 1 "Depth"
Name 122 "psout"
Name 130 "@entryPointOutput"
Name 133 "g_tTex1df4a"
Name 129 "PS_OUTPUT"
MemberName 129(PS_OUTPUT) 0 "Color"
MemberName 129(PS_OUTPUT) 1 "Depth"
Name 131 "@entryPointOutput"
Name 134 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -333,8 +336,10 @@ gl_FragCoord origin is upper left
Decorate 100(g_tTexcdi4) DescriptorSet 0
Decorate 110(g_tTexcdu4) DescriptorSet 0
MemberDecorate 120(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 133(g_tTex1df4a) DescriptorSet 0
Decorate 133(g_tTex1df4a) Binding 1
MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 131(@entryPointOutput) Location 0
Decorate 134(g_tTex1df4a) DescriptorSet 0
Decorate 134(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -412,9 +417,10 @@ gl_FragCoord origin is upper left
124: 7(fvec4) ConstantComposite 117 117 117 117
126: 25(int) Constant 1
127: TypePointer Function 6(float)
129: TypePointer Output 120(PS_OUTPUT)
130(@entryPointOutput): 129(ptr) Variable Output
133(g_tTex1df4a): 11(ptr) Variable UniformConstant
129(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
130: TypePointer Output 129(PS_OUTPUT)
131(@entryPointOutput): 130(ptr) Variable Output
134(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -476,7 +482,7 @@ gl_FragCoord origin is upper left
Store 125 124
128: 127(ptr) AccessChain 122(psout) 126
Store 128 117
131:120(PS_OUTPUT) Load 122(psout)
Store 130(@entryPointOutput) 131
132:120(PS_OUTPUT) Load 122(psout)
Store 131(@entryPointOutput) 132
Return
FunctionEnd