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

62
Test/baseResults/hlsl.samplebias.offset.dx10.frag.out
View File

@@ -159,7 +159,7 @@ gl_FragCoord origin is upper left
0:46 1.000000
0:48 Sequence
0:48 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Branch: Return
0:? Linker Objects
@@ -342,7 +342,7 @@ gl_FragCoord origin is upper left
0:46 1.000000
0:48 Sequence
0:48 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Branch: Return
0:? Linker Objects
@@ -363,13 +363,13 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 149
// Id's are bound by 150
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 136
EntryPoint Fragment 4 "main" 137
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -395,11 +395,14 @@ gl_FragCoord origin is upper left
MemberName 127(PS_OUTPUT) 0 "Color"
MemberName 127(PS_OUTPUT) 1 "Depth"
Name 129 "psout"
Name 136 "@entryPointOutput"
Name 139 "g_tTex1df4a"
Name 142 "g_tTexcdf4"
Name 145 "g_tTexcdi4"
Name 148 "g_tTexcdu4"
Name 135 "PS_OUTPUT"
MemberName 135(PS_OUTPUT) 0 "Color"
MemberName 135(PS_OUTPUT) 1 "Depth"
Name 137 "@entryPointOutput"
Name 140 "g_tTex1df4a"
Name 143 "g_tTexcdf4"
Name 146 "g_tTexcdi4"
Name 149 "g_tTexcdu4"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -413,11 +416,13 @@ gl_FragCoord origin is upper left
Decorate 105(g_tTex3di4) DescriptorSet 0
Decorate 116(g_tTex3du4) DescriptorSet 0
MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 139(g_tTex1df4a) DescriptorSet 0
Decorate 139(g_tTex1df4a) Binding 1
Decorate 142(g_tTexcdf4) DescriptorSet 0
Decorate 145(g_tTexcdi4) DescriptorSet 0
Decorate 148(g_tTexcdu4) DescriptorSet 0
MemberDecorate 135(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 137(@entryPointOutput) Location 0
Decorate 140(g_tTex1df4a) DescriptorSet 0
Decorate 140(g_tTex1df4a) Binding 1
Decorate 143(g_tTexcdf4) DescriptorSet 0
Decorate 146(g_tTexcdi4) DescriptorSet 0
Decorate 149(g_tTexcdu4) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -501,18 +506,19 @@ gl_FragCoord origin is upper left
130: 6(float) Constant 1065353216
131: 7(fvec4) ConstantComposite 130 130 130 130
133: TypePointer Function 6(float)
135: TypePointer Output 127(PS_OUTPUT)
136(@entryPointOutput): 135(ptr) Variable Output
139(g_tTex1df4a): 11(ptr) Variable UniformConstant
140: TypeImage 6(float) Cube sampled format:Unknown
141: TypePointer UniformConstant 140
142(g_tTexcdf4): 141(ptr) Variable UniformConstant
143: TypeImage 22(int) Cube sampled format:Unknown
144: TypePointer UniformConstant 143
145(g_tTexcdi4): 144(ptr) Variable UniformConstant
146: TypeImage 37(int) Cube sampled format:Unknown
147: TypePointer UniformConstant 146
148(g_tTexcdu4): 147(ptr) Variable UniformConstant
135(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
136: TypePointer Output 135(PS_OUTPUT)
137(@entryPointOutput): 136(ptr) Variable Output
140(g_tTex1df4a): 11(ptr) Variable UniformConstant
141: TypeImage 6(float) Cube sampled format:Unknown
142: TypePointer UniformConstant 141
143(g_tTexcdf4): 142(ptr) Variable UniformConstant
144: TypeImage 22(int) Cube sampled format:Unknown
145: TypePointer UniformConstant 144
146(g_tTexcdi4): 145(ptr) Variable UniformConstant
147: TypeImage 37(int) Cube sampled format:Unknown
148: TypePointer UniformConstant 147
149(g_tTexcdu4): 148(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -574,7 +580,7 @@ gl_FragCoord origin is upper left
Store 132 131
134: 133(ptr) AccessChain 129(psout) 23
Store 134 130
137:127(PS_OUTPUT) Load 129(psout)
Store 136(@entryPointOutput) 137
138:127(PS_OUTPUT) Load 129(psout)
Store 137(@entryPointOutput) 138
Return
FunctionEnd