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

@@ -141,7 +141,7 @@ gl_FragCoord origin is upper left
0:41 1.000000
0:43 Sequence
0:43 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:43 Branch: Return
0:? Linker Objects
@@ -303,7 +303,7 @@ gl_FragCoord origin is upper left
0:41 1.000000
0:43 Sequence
0:43 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:43 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:43 Branch: Return
0:? Linker Objects
@@ -321,7 +321,7 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 145
// Id's are bound by 146
Capability Shader
Capability Sampled1D
@@ -329,7 +329,7 @@ gl_FragCoord origin is upper left
Capability ImageQuery
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 141
EntryPoint Fragment 4 "main" 142
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 8 "txval10"
@@ -355,8 +355,11 @@ gl_FragCoord origin is upper left
MemberName 131(PS_OUTPUT) 0 "Color"
MemberName 131(PS_OUTPUT) 1 "Depth"
Name 133 "psout"
Name 141 "@entryPointOutput"
Name 144 "g_tTex1df4"
Name 140 "PS_OUTPUT"
MemberName 140(PS_OUTPUT) 0 "Color"
MemberName 140(PS_OUTPUT) 1 "Depth"
Name 142 "@entryPointOutput"
Name 145 "g_tTex1df4"
Decorate 11(g_tTex1df4a) DescriptorSet 0
Decorate 11(g_tTex1df4a) Binding 1
Decorate 15(g_sSamp) DescriptorSet 0
@@ -370,8 +373,10 @@ gl_FragCoord origin is upper left
Decorate 106(g_tTexcdi4a) DescriptorSet 0
Decorate 118(g_tTexcdu4a) DescriptorSet 0
MemberDecorate 131(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 144(g_tTex1df4) DescriptorSet 0
Decorate 144(g_tTex1df4) Binding 0
MemberDecorate 140(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 142(@entryPointOutput) Location 0
Decorate 145(g_tTex1df4) DescriptorSet 0
Decorate 145(g_tTex1df4) Binding 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -442,9 +447,10 @@ gl_FragCoord origin is upper left
135: 130(fvec4) ConstantComposite 134 134 134 134
136: TypePointer Function 130(fvec4)
138: 23(int) Constant 1
140: TypePointer Output 131(PS_OUTPUT)
141(@entryPointOutput): 140(ptr) Variable Output
144(g_tTex1df4): 10(ptr) Variable UniformConstant
140(PS_OUTPUT): TypeStruct 130(fvec4) 6(float)
141: TypePointer Output 140(PS_OUTPUT)
142(@entryPointOutput): 141(ptr) Variable Output
145(g_tTex1df4): 10(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
8(txval10): 7(ptr) Variable Function
@@ -524,7 +530,7 @@ gl_FragCoord origin is upper left
Store 137 135
139: 7(ptr) AccessChain 133(psout) 138
Store 139 134
142:131(PS_OUTPUT) Load 133(psout)
Store 141(@entryPointOutput) 142
143:131(PS_OUTPUT) Load 133(psout)
Store 142(@entryPointOutput) 143
Return
FunctionEnd