mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Flatten a return struct from an entry point and assign locations after flattening.

Browse Source 
Locations now get assigned in order, but skipping built-ins, which can be
done post flattening.
This commit is contained in:
John Kessenich
2016-09-16 01:44:43 -06:00
parent 7f702124ec
commit 7dc630f3da
93 changed files with 951 additions and 495 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Test/baseResults/hlsl.sample.offset.dx10.frag.out
View File

@@ -141,7 +141,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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Branch: Return
0:? Linker Objects
@@ -159,7 +159,8 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4' (uniform textureCube)
0:? 'g_tTexcdi4' (uniform itextureCube)
0:? 'g_tTexcdu4' (uniform utextureCube)
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
Linked fragment stage:
@@ -307,7 +308,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' (layout(location=0 ) out 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:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Branch: Return
0:? Linker Objects
@@ -325,17 +326,18 @@ gl_FragCoord origin is upper left
0:? 'g_tTexcdf4' (uniform textureCube)
0:? 'g_tTexcdi4' (uniform itextureCube)
0:? 'g_tTexcdu4' (uniform utextureCube)
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? 'Color' (layout(location=0 ) out 4-component vector of float)
0:? 'Depth' (out float FragDepth)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 149
// Id's are bound by 153
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 136
EntryPoint Fragment 4 "main" 136 150 152
ExecutionMode 4 OriginUpperLeft
Name 4 "main"
Name 9 "txval10"
@@ -366,6 +368,8 @@ gl_FragCoord origin is upper left
Name 142 "g_tTexcdf4"
Name 145 "g_tTexcdi4"
Name 148 "g_tTexcdu4"
Name 150 "Color"
Name 152 "Depth"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -379,12 +383,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 136(@entryPointOutput) Location 0
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
Decorate 150(Color) Location 0
Decorate 152(Depth) BuiltIn FragDepth
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -480,6 +485,10 @@ gl_FragCoord origin is upper left
146: TypeImage 36(int) Cube sampled format:Unknown
147: TypePointer UniformConstant 146
148(g_tTexcdu4): 147(ptr) Variable UniformConstant
149: TypePointer Output 7(fvec4)
150(Color): 149(ptr) Variable Output
151: TypePointer Output 6(float)
152(Depth): 151(ptr) Variable Output
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function