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

HLSL: Flatten all input/output structs, regardless of stage.

Browse Source 
This is needed because an output structure can contain embedded built-ins
(like SV_Position) which should not get locations assigned.
This commit is contained in:
John Kessenich
2016-09-16 01:52:14 -06:00
parent 7dc630f3da
commit f8e494c18c
7 changed files with 53 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Test/baseResults/hlsl.samplelevel.basic.dx10.vert.out
View File

@@ -163,7 +163,7 @@ Shader version: 450
0:? 0.000000
0:48 Sequence
0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos})
0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos})
0:48 Branch: Return
0:? Linker Objects
@@ -181,7 +181,7 @@ Shader version: 450
0:? 'g_tTexcdf4' (uniform textureCube)
0:? 'g_tTexcdi4' (uniform itextureCube)
0:? 'g_tTexcdu4' (uniform utextureCube)
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos})
0:? 'Pos' (out 4-component vector of float Position)
Linked vertex stage:
@@ -351,7 +351,7 @@ Shader version: 450
0:? 0.000000
0:48 Sequence
0:48 move second child to first child (temp structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Position Pos})
0:48 'vsout' (temp structure{temp 4-component vector of float Position Pos})
0:48 Branch: Return
0:? Linker Objects
@@ -369,17 +369,17 @@ Shader version: 450
0:? 'g_tTexcdf4' (uniform textureCube)
0:? 'g_tTexcdi4' (uniform itextureCube)
0:? 'g_tTexcdu4' (uniform utextureCube)
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp 4-component vector of float Position Pos})
0:? 'Pos' (out 4-component vector of float Position)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 156
// Id's are bound by 158
Capability Shader
Capability Sampled1D
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 152
EntryPoint Vertex 4 "main" 152 157
Name 4 "main"
Name 9 "txval10"
Name 12 "g_tTex1df4"
@@ -411,6 +411,7 @@ Shader version: 450
Name 146 "vsout"
Name 152 "@entryPointOutput"
Name 155 "g_tTex1df4a"
Name 157 "Pos"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 12(g_tTex1df4) Binding 0
Decorate 16(g_sSamp) DescriptorSet 0
@@ -427,9 +428,9 @@ Shader version: 450
Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(VS_OUTPUT) 0 BuiltIn Position
Decorate 152(@entryPointOutput) Location 0
Decorate 155(g_tTex1df4a) DescriptorSet 0
Decorate 155(g_tTex1df4a) Binding 1
Decorate 157(Pos) BuiltIn Position
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -518,6 +519,8 @@ Shader version: 450
151: TypePointer Output 144(VS_OUTPUT)
152(@entryPointOutput): 151(ptr) Variable Output
155(g_tTex1df4a): 11(ptr) Variable UniformConstant
156: TypePointer Output 7(fvec4)
157(Pos): 156(ptr) Variable Output
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function