
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.
201 lines
12 KiB
Plaintext
Executable File
201 lines
12 KiB
Plaintext
Executable File
hlsl.entry-in.frag
|
|
Shader version: 450
|
|
gl_FragCoord origin is upper left
|
|
0:? Sequence
|
|
0:8 Function Definition: fun(struct-InParam-vf2-vf4-vi21; (temp float)
|
|
0:8 Function Parameters:
|
|
0:8 'p' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:? Sequence
|
|
0:9 Branch: Return with expression
|
|
0:9 add (temp float)
|
|
0:9 direct index (temp float)
|
|
0:9 v: direct index for structure (temp 2-component vector of float)
|
|
0:9 'p' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:9 Constant:
|
|
0:9 0 (const int)
|
|
0:9 Constant:
|
|
0:9 1 (const int)
|
|
0:9 direct index (temp float)
|
|
0:9 fragCoord: direct index for structure (temp 4-component vector of float FragCoord)
|
|
0:9 'p' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:9 Constant:
|
|
0:9 1 (const int)
|
|
0:9 Constant:
|
|
0:9 0 (const int)
|
|
0:13 Function Definition: PixelShaderFunction(struct-InParam-vf2-vf4-vi21; (temp 4-component vector of float)
|
|
0:13 Function Parameters:
|
|
0:13 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:? Sequence
|
|
0:15 move second child to first child (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:15 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:15 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:16 Sequence
|
|
0:16 move second child to first child (temp float)
|
|
0:16 'ret1' (temp float)
|
|
0:16 Function Call: fun(struct-InParam-vf2-vf4-vi21; (temp float)
|
|
0:16 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:17 Sequence
|
|
0:17 move second child to first child (temp float)
|
|
0:17 'ret2' (temp float)
|
|
0:17 Function Call: fun(struct-InParam-vf2-vf4-vi21; (temp float)
|
|
0:17 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:19 Sequence
|
|
0:19 move second child to first child (temp 4-component vector of float)
|
|
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
|
0:19 vector-scale (temp 4-component vector of float)
|
|
0:19 vector-scale (temp 4-component vector of float)
|
|
0:19 fragCoord: direct index for structure (temp 4-component vector of float FragCoord)
|
|
0:19 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:19 Constant:
|
|
0:19 1 (const int)
|
|
0:19 'ret1' (temp float)
|
|
0:19 'ret2' (temp float)
|
|
0:19 Branch: Return
|
|
0:? Linker Objects
|
|
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
|
0:? 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
|
|
|
|
Linked fragment stage:
|
|
|
|
|
|
Shader version: 450
|
|
gl_FragCoord origin is upper left
|
|
0:? Sequence
|
|
0:8 Function Definition: fun(struct-InParam-vf2-vf4-vi21; (temp float)
|
|
0:8 Function Parameters:
|
|
0:8 'p' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:? Sequence
|
|
0:9 Branch: Return with expression
|
|
0:9 add (temp float)
|
|
0:9 direct index (temp float)
|
|
0:9 v: direct index for structure (temp 2-component vector of float)
|
|
0:9 'p' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:9 Constant:
|
|
0:9 0 (const int)
|
|
0:9 Constant:
|
|
0:9 1 (const int)
|
|
0:9 direct index (temp float)
|
|
0:9 fragCoord: direct index for structure (temp 4-component vector of float FragCoord)
|
|
0:9 'p' (in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:9 Constant:
|
|
0:9 1 (const int)
|
|
0:9 Constant:
|
|
0:9 0 (const int)
|
|
0:13 Function Definition: PixelShaderFunction(struct-InParam-vf2-vf4-vi21; (temp 4-component vector of float)
|
|
0:13 Function Parameters:
|
|
0:13 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:? Sequence
|
|
0:15 move second child to first child (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:15 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:15 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:16 Sequence
|
|
0:16 move second child to first child (temp float)
|
|
0:16 'ret1' (temp float)
|
|
0:16 Function Call: fun(struct-InParam-vf2-vf4-vi21; (temp float)
|
|
0:16 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:17 Sequence
|
|
0:17 move second child to first child (temp float)
|
|
0:17 'ret2' (temp float)
|
|
0:17 Function Call: fun(struct-InParam-vf2-vf4-vi21; (temp float)
|
|
0:17 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:19 Sequence
|
|
0:19 move second child to first child (temp 4-component vector of float)
|
|
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
|
0:19 vector-scale (temp 4-component vector of float)
|
|
0:19 vector-scale (temp 4-component vector of float)
|
|
0:19 fragCoord: direct index for structure (temp 4-component vector of float FragCoord)
|
|
0:19 'local' (temp structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
0:19 Constant:
|
|
0:19 1 (const int)
|
|
0:19 'ret1' (temp float)
|
|
0:19 'ret2' (temp float)
|
|
0:19 Branch: Return
|
|
0:? Linker Objects
|
|
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
|
|
0:? 'i' (layout(location=0 ) in structure{temp 2-component vector of float v, temp 4-component vector of float FragCoord fragCoord, temp 2-component vector of int i2})
|
|
|
|
// Module Version 10000
|
|
// Generated by (magic number): 80001
|
|
// Id's are bound by 52
|
|
|
|
Capability Shader
|
|
1: ExtInstImport "GLSL.std.450"
|
|
MemoryModel Logical GLSL450
|
|
EntryPoint Fragment 4 "PixelShaderFunction" 32 43
|
|
ExecutionMode 4 OriginUpperLeft
|
|
Name 4 "PixelShaderFunction"
|
|
Name 11 "InParam"
|
|
MemberName 11(InParam) 0 "v"
|
|
MemberName 11(InParam) 1 "fragCoord"
|
|
MemberName 11(InParam) 2 "i2"
|
|
Name 15 "fun(struct-InParam-vf2-vf4-vi21;"
|
|
Name 14 "p"
|
|
Name 30 "local"
|
|
Name 32 "i"
|
|
Name 34 "ret1"
|
|
Name 35 "param"
|
|
Name 38 "ret2"
|
|
Name 39 "param"
|
|
Name 43 "@entryPointOutput"
|
|
MemberDecorate 11(InParam) 1 BuiltIn FragCoord
|
|
Decorate 32(i) Location 0
|
|
Decorate 43(@entryPointOutput) Location 0
|
|
2: TypeVoid
|
|
3: TypeFunction 2
|
|
6: TypeFloat 32
|
|
7: TypeVector 6(float) 2
|
|
8: TypeVector 6(float) 4
|
|
9: TypeInt 32 1
|
|
10: TypeVector 9(int) 2
|
|
11(InParam): TypeStruct 7(fvec2) 8(fvec4) 10(ivec2)
|
|
12: TypePointer Function 11(InParam)
|
|
13: TypeFunction 6(float) 12(ptr)
|
|
17: 9(int) Constant 0
|
|
18: TypeInt 32 0
|
|
19: 18(int) Constant 1
|
|
20: TypePointer Function 6(float)
|
|
23: 9(int) Constant 1
|
|
24: 18(int) Constant 0
|
|
31: TypePointer Input 11(InParam)
|
|
32(i): 31(ptr) Variable Input
|
|
42: TypePointer Output 8(fvec4)
|
|
43(@entryPointOutput): 42(ptr) Variable Output
|
|
44: TypePointer Function 8(fvec4)
|
|
4(PixelShaderFunction): 2 Function None 3
|
|
5: Label
|
|
30(local): 12(ptr) Variable Function
|
|
34(ret1): 20(ptr) Variable Function
|
|
35(param): 12(ptr) Variable Function
|
|
38(ret2): 20(ptr) Variable Function
|
|
39(param): 12(ptr) Variable Function
|
|
33: 11(InParam) Load 32(i)
|
|
Store 30(local) 33
|
|
36: 11(InParam) Load 30(local)
|
|
Store 35(param) 36
|
|
37: 6(float) FunctionCall 15(fun(struct-InParam-vf2-vf4-vi21;) 35(param)
|
|
Store 34(ret1) 37
|
|
40: 11(InParam) Load 32(i)
|
|
Store 39(param) 40
|
|
41: 6(float) FunctionCall 15(fun(struct-InParam-vf2-vf4-vi21;) 39(param)
|
|
Store 38(ret2) 41
|
|
45: 44(ptr) AccessChain 30(local) 23
|
|
46: 8(fvec4) Load 45
|
|
47: 6(float) Load 34(ret1)
|
|
48: 8(fvec4) VectorTimesScalar 46 47
|
|
49: 6(float) Load 38(ret2)
|
|
50: 8(fvec4) VectorTimesScalar 48 49
|
|
Store 43(@entryPointOutput) 50
|
|
Return
|
|
FunctionEnd
|
|
15(fun(struct-InParam-vf2-vf4-vi21;): 6(float) Function None 13
|
|
14(p): 12(ptr) FunctionParameter
|
|
16: Label
|
|
21: 20(ptr) AccessChain 14(p) 17 19
|
|
22: 6(float) Load 21
|
|
25: 20(ptr) AccessChain 14(p) 23 24
|
|
26: 6(float) Load 25
|
|
27: 6(float) FAdd 22 26
|
|
ReturnValue 27
|
|
FunctionEnd
|