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

@@ -177,7 +177,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
@@ -375,7 +375,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
@@ -393,14 +393,14 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 128
// Id's are bound by 129
Capability Shader
Capability Sampled1D
Capability SampledCubeArray
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 124
EntryPoint Fragment 4 "main" 125
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -426,8 +426,11 @@ gl_FragCoord origin is upper left
MemberName 113(PS_OUTPUT) 0 "Color"
MemberName 113(PS_OUTPUT) 1 "Depth"
Name 115 "psout"
Name 124 "@entryPointOutput"
Name 127 "g_tTex1df4a"
Name 123 "PS_OUTPUT"
MemberName 123(PS_OUTPUT) 0 "Color"
MemberName 123(PS_OUTPUT) 1 "Depth"
Name 125 "@entryPointOutput"
Name 128 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -441,8 +444,10 @@ gl_FragCoord origin is upper left
Decorate 98(g_tTexcdi4) DescriptorSet 0
Decorate 107(g_tTexcdu4) DescriptorSet 0
MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 127(g_tTex1df4a) DescriptorSet 0
Decorate 127(g_tTex1df4a) Binding 1
MemberDecorate 123(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 125(@entryPointOutput) Location 0
Decorate 128(g_tTex1df4a) DescriptorSet 0
Decorate 128(g_tTex1df4a) Binding 1
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -514,9 +519,10 @@ gl_FragCoord origin is upper left
118: 7(fvec4) ConstantComposite 117 117 117 117
120: 27(int) Constant 1
121: TypePointer Function 6(float)
123: TypePointer Output 113(PS_OUTPUT)
124(@entryPointOutput): 123(ptr) Variable Output
127(g_tTex1df4a): 11(ptr) Variable UniformConstant
123(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
124: TypePointer Output 123(PS_OUTPUT)
125(@entryPointOutput): 124(ptr) Variable Output
128(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -578,7 +584,7 @@ gl_FragCoord origin is upper left
Store 119 118
122: 121(ptr) AccessChain 115(psout) 120
Store 122 117
125:113(PS_OUTPUT) Load 115(psout)
Store 124(@entryPointOutput) 125
126:113(PS_OUTPUT) Load 115(psout)
Store 125(@entryPointOutput) 126
Return
FunctionEnd