mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
glslang/Test/baseResults/hlsl.struct.split.call.vert.out
steve-lunarg a2e7531057 HLSL: inter-stage structure splitting. 
This adds structure splitting, which among other things will enable GS support where input structs
are passed, and thus become input arrays of structs in the GS inputs.  That is a common GS case.

The salient points of this PR are:

* Structure splitting has been changed from "always between stages" to "only into the VS and out of
  the PS".  It had previously happened between stages because it's not legal to pass a struct
  containing a builtin IO variable.

* Structs passed between stages are now split into a struct containing ONLY user types, and a
  collection of loose builtin IO variables, if any.  The user-part is passed as a normal struct
  between stages, which is valid SPIR-V now that the builtin IO is removed.

* Internal to the shader, a sanitized struct (with IO qualifiers removed) is used, so that e.g,
  functions can work unmodified.

* If a builtin IO such as Position occurs in an arrayed struct, for example as an input to a GS,
  the array reference is moved to the split-off loose variable, which is given the array dimension
  itself.

When passing things around inside the shader, such as over a function call, the the original type
is used in a sanitized form that removes the builtIn qualifications and makes them temporaries.
This means internal function calls do not have to change.  However, the type when returned from
the shader will be member-wise copied from the internal sanitized one to the external type.
The sanitized type is used in variable declarations.

When copying split types and unsplit, if a sub-struct contains only user variables, it is copied
as a single entity to avoid more AST verbosity.

Above strategy arrived at with talks with @johnkslang.

This is a big complex change.  I'm inclined to leave it as a WIP until it can get some exposure to
real world cases.
2016-12-26 10:11:15 -07:00

318 lines
18 KiB
Plaintext
Raw Blame History

hlsl.struct.split.call.vert
Shader version: 450
0:? Sequence
0:17 Function Definition: Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11; (temp void)
0:17 Function Parameters:
0:17 'fn1_in' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:17 'fn1_out' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:? Sequence
0:18 add (temp 4-component vector of float)
0:18 Pos_in: direct index for structure (temp 4-component vector of float)
0:18 'fn1_in' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:18 Constant:
0:18 1 (const int)
0:18 Pos_out: direct index for structure (temp 4-component vector of float)
0:18 'fn1_out' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:18 Constant:
0:18 1 (const int)
0:22 Function Definition: main(struct-VS_INPUT-i1-vf4-i11; (temp structure{temp int x0_out, temp 4-component vector of float Position Pos_out, temp int x1_out})
0:22 Function Parameters:
0:22 'vsin' (in structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:? Sequence
0:25 move second child to first child (temp int)
0:25 x0_out: direct index for structure (temp int)
0:25 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:25 Constant:
0:25 0 (const int)
0:? 'x0_in' (layout(location=0 ) in int)
0:26 move second child to first child (temp 4-component vector of float)
0:26 Pos_out: direct index for structure (temp 4-component vector of float)
0:26 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:26 Constant:
0:26 1 (const int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:27 move second child to first child (temp int)
0:27 x1_out: direct index for structure (temp int)
0:27 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:27 Constant:
0:27 2 (const int)
0:? 'x1_in' (layout(location=1 ) in int)
0:29 Function Call: Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11; (temp void)
0:29 Comma (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Sequence
0:29 move second child to first child (temp int)
0:29 x0_in: direct index for structure (temp int)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Constant:
0:29 0 (const int)
0:? 'x0_in' (layout(location=0 ) in int)
0:29 move second child to first child (temp 4-component vector of float)
0:29 Pos_in: direct index for structure (temp 4-component vector of float)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Constant:
0:29 1 (const int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:29 move second child to first child (temp int)
0:29 x1_in: direct index for structure (temp int)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Constant:
0:29 2 (const int)
0:? 'x1_in' (layout(location=1 ) in int)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Sequence
0:31 Sequence
0:31 move second child to first child (temp int)
0:31 x0_out: direct index for structure (temp int)
0:31 '@entryPointOutput' (layout(location=0 ) out structure{temp int x0_out, temp int x1_out})
0:31 Constant:
0:31 0 (const int)
0:31 x0_out: direct index for structure (temp int)
0:31 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Constant:
0:31 0 (const int)
0:31 move second child to first child (temp 4-component vector of float)
0:? 'Pos_out' (out 4-component vector of float Position)
0:31 Pos_out: direct index for structure (temp 4-component vector of float)
0:31 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Constant:
0:31 1 (const int)
0:31 move second child to first child (temp int)
0:31 x1_out: direct index for structure (temp int)
0:31 '@entryPointOutput' (layout(location=0 ) out structure{temp int x0_out, temp int x1_out})
0:31 Constant:
0:31 1 (const int)
0:31 x1_out: direct index for structure (temp int)
0:31 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Constant:
0:31 2 (const int)
0:31 Branch: Return
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp int x0_out, temp int x1_out})
0:? 'x0_in' (layout(location=0 ) in int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:? 'x1_in' (layout(location=1 ) in int)
0:? 'Pos_out' (out 4-component vector of float Position)
Linked vertex stage:
Shader version: 450
0:? Sequence
0:17 Function Definition: Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11; (temp void)
0:17 Function Parameters:
0:17 'fn1_in' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:17 'fn1_out' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:? Sequence
0:18 add (temp 4-component vector of float)
0:18 Pos_in: direct index for structure (temp 4-component vector of float)
0:18 'fn1_in' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:18 Constant:
0:18 1 (const int)
0:18 Pos_out: direct index for structure (temp 4-component vector of float)
0:18 'fn1_out' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:18 Constant:
0:18 1 (const int)
0:22 Function Definition: main(struct-VS_INPUT-i1-vf4-i11; (temp structure{temp int x0_out, temp 4-component vector of float Position Pos_out, temp int x1_out})
0:22 Function Parameters:
0:22 'vsin' (in structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:? Sequence
0:25 move second child to first child (temp int)
0:25 x0_out: direct index for structure (temp int)
0:25 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:25 Constant:
0:25 0 (const int)
0:? 'x0_in' (layout(location=0 ) in int)
0:26 move second child to first child (temp 4-component vector of float)
0:26 Pos_out: direct index for structure (temp 4-component vector of float)
0:26 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:26 Constant:
0:26 1 (const int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:27 move second child to first child (temp int)
0:27 x1_out: direct index for structure (temp int)
0:27 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:27 Constant:
0:27 2 (const int)
0:? 'x1_in' (layout(location=1 ) in int)
0:29 Function Call: Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11; (temp void)
0:29 Comma (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Sequence
0:29 move second child to first child (temp int)
0:29 x0_in: direct index for structure (temp int)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Constant:
0:29 0 (const int)
0:? 'x0_in' (layout(location=0 ) in int)
0:29 move second child to first child (temp 4-component vector of float)
0:29 Pos_in: direct index for structure (temp 4-component vector of float)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Constant:
0:29 1 (const int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:29 move second child to first child (temp int)
0:29 x1_in: direct index for structure (temp int)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 Constant:
0:29 2 (const int)
0:? 'x1_in' (layout(location=1 ) in int)
0:29 'aggShadow' (temp structure{temp int x0_in, temp 4-component vector of float Pos_in, temp int x1_in})
0:29 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Sequence
0:31 Sequence
0:31 move second child to first child (temp int)
0:31 x0_out: direct index for structure (temp int)
0:31 '@entryPointOutput' (layout(location=0 ) out structure{temp int x0_out, temp int x1_out})
0:31 Constant:
0:31 0 (const int)
0:31 x0_out: direct index for structure (temp int)
0:31 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Constant:
0:31 0 (const int)
0:31 move second child to first child (temp 4-component vector of float)
0:? 'Pos_out' (out 4-component vector of float Position)
0:31 Pos_out: direct index for structure (temp 4-component vector of float)
0:31 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Constant:
0:31 1 (const int)
0:31 move second child to first child (temp int)
0:31 x1_out: direct index for structure (temp int)
0:31 '@entryPointOutput' (layout(location=0 ) out structure{temp int x0_out, temp int x1_out})
0:31 Constant:
0:31 1 (const int)
0:31 x1_out: direct index for structure (temp int)
0:31 'vsout' (temp structure{temp int x0_out, temp 4-component vector of float Pos_out, temp int x1_out})
0:31 Constant:
0:31 2 (const int)
0:31 Branch: Return
0:? Linker Objects
0:? '@entryPointOutput' (layout(location=0 ) out structure{temp int x0_out, temp int x1_out})
0:? 'x0_in' (layout(location=0 ) in int)
0:? 'Pos_in' (in 4-component vector of float Position)
0:? 'x1_in' (layout(location=1 ) in int)
0:? 'Pos_out' (out 4-component vector of float Position)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 69
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Vertex 4 "main" 28 33 37 56 62
Name 4 "main"
Name 9 "VS_INPUT"
MemberName 9(VS_INPUT) 0 "x0_in"
MemberName 9(VS_INPUT) 1 "Pos_in"
MemberName 9(VS_INPUT) 2 "x1_in"
Name 11 "VS_OUTPUT"
MemberName 11(VS_OUTPUT) 0 "x0_out"
MemberName 11(VS_OUTPUT) 1 "Pos_out"
MemberName 11(VS_OUTPUT) 2 "x1_out"
Name 16 "Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11;"
Name 14 "fn1_in"
Name 15 "fn1_out"
Name 25 "vsout"
Name 28 "x0_in"
Name 33 "Pos_in"
Name 37 "x1_in"
Name 40 "VS_INPUT"
MemberName 40(VS_INPUT) 0 "x0_in"
MemberName 40(VS_INPUT) 1 "Pos_in"
MemberName 40(VS_INPUT) 2 "x1_in"
Name 42 "aggShadow"
Name 49 "param"
Name 51 "param"
Name 54 "VS_OUTPUT"
MemberName 54(VS_OUTPUT) 0 "x0_out"
MemberName 54(VS_OUTPUT) 1 "x1_out"
Name 56 "@entryPointOutput"
Name 62 "Pos_out"
Decorate 28(x0_in) Location 0
Decorate 33(Pos_in) BuiltIn Position
Decorate 37(x1_in) Location 1
Decorate 56(@entryPointOutput) Location 0
Decorate 62(Pos_out) BuiltIn Position
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1
7: TypeFloat 32
8: TypeVector 7(float) 4
9(VS_INPUT): TypeStruct 6(int) 8(fvec4) 6(int)
10: TypePointer Function 9(VS_INPUT)
11(VS_OUTPUT): TypeStruct 6(int) 8(fvec4) 6(int)
12: TypePointer Function 11(VS_OUTPUT)
13: TypeFunction 2 10(ptr) 12(ptr)
18: 6(int) Constant 1
19: TypePointer Function 8(fvec4)
26: 6(int) Constant 0
27: TypePointer Input 6(int)
28(x0_in): 27(ptr) Variable Input
30: TypePointer Function 6(int)
32: TypePointer Input 8(fvec4)
33(Pos_in): 32(ptr) Variable Input
36: 6(int) Constant 2
37(x1_in): 27(ptr) Variable Input
40(VS_INPUT): TypeStruct 6(int) 8(fvec4) 6(int)
41: TypePointer Function 40(VS_INPUT)
54(VS_OUTPUT): TypeStruct 6(int) 6(int)
55: TypePointer Output 54(VS_OUTPUT)
56(@entryPointOutput): 55(ptr) Variable Output
59: TypePointer Output 6(int)
61: TypePointer Output 8(fvec4)
62(Pos_out): 61(ptr) Variable Output
4(main): 2 Function None 3
5: Label
25(vsout): 12(ptr) Variable Function
42(aggShadow): 41(ptr) Variable Function
49(param): 41(ptr) Variable Function
51(param): 12(ptr) Variable Function
29: 6(int) Load 28(x0_in)
31: 30(ptr) AccessChain 25(vsout) 26
Store 31 29
34: 8(fvec4) Load 33(Pos_in)
35: 19(ptr) AccessChain 25(vsout) 18
Store 35 34
38: 6(int) Load 37(x1_in)
39: 30(ptr) AccessChain 25(vsout) 36
Store 39 38
43: 6(int) Load 28(x0_in)
44: 30(ptr) AccessChain 42(aggShadow) 26
Store 44 43
45: 8(fvec4) Load 33(Pos_in)
46: 19(ptr) AccessChain 42(aggShadow) 18
Store 46 45
47: 6(int) Load 37(x1_in)
48: 30(ptr) AccessChain 42(aggShadow) 36
Store 48 47
50:40(VS_INPUT) Load 42(aggShadow)
Store 49(param) 50
52:11(VS_OUTPUT) Load 25(vsout)
Store 51(param) 52
53: 2 FunctionCall 16(Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11;) 49(param) 51(param)
57: 30(ptr) AccessChain 25(vsout) 26
58: 6(int) Load 57
60: 59(ptr) AccessChain 56(@entryPointOutput) 26
Store 60 58
63: 19(ptr) AccessChain 25(vsout) 18
64: 8(fvec4) Load 63
Store 62(Pos_out) 64
65: 30(ptr) AccessChain 25(vsout) 36
66: 6(int) Load 65
67: 59(ptr) AccessChain 56(@entryPointOutput) 18
Store 67 66
Return
FunctionEnd
16(Fn1(struct-VS_INPUT-i1-vf4-i11;struct-VS_OUTPUT-i1-vf4-i11;): 2 Function None 13
14(fn1_in): 10(ptr) FunctionParameter
15(fn1_out): 12(ptr) FunctionParameter
17: Label
20: 19(ptr) AccessChain 14(fn1_in) 18
21: 8(fvec4) Load 20
22: 19(ptr) AccessChain 15(fn1_out) 18
23: 8(fvec4) Load 22
24: 8(fvec4) FAdd 21 23
Return
FunctionEnd
Reference in New Issue View Git Blame Copy Permalink