mirror of
https://github.com/RPCS3/glslang.git
synced 2024-12-03 16:41:30 +00:00
a2b01a0da8
This PR implements recursive type flattening. For example, an array of structs of other structs can be flattened to individual member variables at the shader interface. This is sufficient for many purposes, e.g, uniforms containing opaque types, but is not sufficient for geometry shader arrayed inputs. That will be handled separately with structure splitting, which is not implemented by this PR. In the meantime, that case is detected and triggers an error. The recursive flattening extends the following three aspects of single-level flattening: - Flattening of structures to individual members with names such as "foo[0].samp[1]"; - Turning constant references to the nested composite type into a reference to a particular flattened member. - Shadow copies between arrays of flattened members and the nested composite type. Previous single-level flattening only flattened at the shader interface, and that is unchanged by this PR. Internally, shadow copies are, such as if the type is passed to a function. Also, the reasons for flattening are unchanged. Uniforms containing opaque types, and interface struct types are flattened. (The latter will change with structure splitting). One existing test changes: hlsl.structin.vert, which did in fact contain a nested composite type to be flattened. Two new tests are added: hlsl.structarray.flatten.frag, and hlsl.structarray.flatten.geom (currently issues an error until type splitting is online). The process of arriving at the individual member from chained postfix expressions is more complex than it was with one level. See large-ish comment above HlslParseContext::flatten() for details.
198 lines
10 KiB
Plaintext
198 lines
10 KiB
Plaintext
hlsl.structarray.flatten.frag
|
|
Shader version: 450
|
|
gl_FragCoord origin is upper left
|
|
0:? Sequence
|
|
0:23 Function Definition: main(struct-PS_OUTPUT-vf41; (temp void)
|
|
0:23 Function Parameters:
|
|
0:23 'ps_output' (out structure{temp 4-component vector of float color})
|
|
0:? Sequence
|
|
0:24 move second child to first child (temp 4-component vector of float)
|
|
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
|
0:26 add (temp 4-component vector of float)
|
|
0:25 add (temp 4-component vector of float)
|
|
0:25 texture (temp 4-component vector of float)
|
|
0:25 Construct combined texture-sampler (temp sampler1D)
|
|
0:? 'tex' (uniform texture1D)
|
|
0:? 'samp' (uniform sampler)
|
|
0:25 Constant:
|
|
0:25 0.500000
|
|
0:26 texture (temp 4-component vector of float)
|
|
0:26 Construct combined texture-sampler (temp sampler1D)
|
|
0:? 'g_texdata_array[1].tex' (uniform texture1D)
|
|
0:? 'g_texdata_array[1].samp' (uniform sampler)
|
|
0:26 Constant:
|
|
0:26 0.400000
|
|
0:27 texture (temp 4-component vector of float)
|
|
0:27 Construct combined texture-sampler (temp sampler1D)
|
|
0:? 'g_texdata_array2[1].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[1].samp[0]' (uniform sampler)
|
|
0:27 Constant:
|
|
0:27 0.300000
|
|
0:? Linker Objects
|
|
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
|
0:? 'g_samp' (uniform sampler)
|
|
0:? 'g_tex' (uniform texture1D)
|
|
0:? 'g_texdata_array2[0].samp[0]' (uniform sampler)
|
|
0:? 'g_texdata_array2[0].samp[1]' (uniform sampler)
|
|
0:? 'g_texdata_array2[0].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[0].tex[1]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[1].samp[0]' (uniform sampler)
|
|
0:? 'g_texdata_array2[1].samp[1]' (uniform sampler)
|
|
0:? 'g_texdata_array2[1].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[1].tex[1]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[2].samp[0]' (uniform sampler)
|
|
0:? 'g_texdata_array2[2].samp[1]' (uniform sampler)
|
|
0:? 'g_texdata_array2[2].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[2].tex[1]' (uniform texture1D)
|
|
|
|
|
|
Linked fragment stage:
|
|
|
|
|
|
Shader version: 450
|
|
gl_FragCoord origin is upper left
|
|
0:? Sequence
|
|
0:23 Function Definition: main(struct-PS_OUTPUT-vf41; (temp void)
|
|
0:23 Function Parameters:
|
|
0:23 'ps_output' (out structure{temp 4-component vector of float color})
|
|
0:? Sequence
|
|
0:24 move second child to first child (temp 4-component vector of float)
|
|
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
|
0:26 add (temp 4-component vector of float)
|
|
0:25 add (temp 4-component vector of float)
|
|
0:25 texture (temp 4-component vector of float)
|
|
0:25 Construct combined texture-sampler (temp sampler1D)
|
|
0:? 'tex' (uniform texture1D)
|
|
0:? 'samp' (uniform sampler)
|
|
0:25 Constant:
|
|
0:25 0.500000
|
|
0:26 texture (temp 4-component vector of float)
|
|
0:26 Construct combined texture-sampler (temp sampler1D)
|
|
0:? 'g_texdata_array[1].tex' (uniform texture1D)
|
|
0:? 'g_texdata_array[1].samp' (uniform sampler)
|
|
0:26 Constant:
|
|
0:26 0.400000
|
|
0:27 texture (temp 4-component vector of float)
|
|
0:27 Construct combined texture-sampler (temp sampler1D)
|
|
0:? 'g_texdata_array2[1].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[1].samp[0]' (uniform sampler)
|
|
0:27 Constant:
|
|
0:27 0.300000
|
|
0:? Linker Objects
|
|
0:? 'color' (layout(location=0 ) out 4-component vector of float)
|
|
0:? 'g_samp' (uniform sampler)
|
|
0:? 'g_tex' (uniform texture1D)
|
|
0:? 'g_texdata_array2[0].samp[0]' (uniform sampler)
|
|
0:? 'g_texdata_array2[0].samp[1]' (uniform sampler)
|
|
0:? 'g_texdata_array2[0].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[0].tex[1]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[1].samp[0]' (uniform sampler)
|
|
0:? 'g_texdata_array2[1].samp[1]' (uniform sampler)
|
|
0:? 'g_texdata_array2[1].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[1].tex[1]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[2].samp[0]' (uniform sampler)
|
|
0:? 'g_texdata_array2[2].samp[1]' (uniform sampler)
|
|
0:? 'g_texdata_array2[2].tex[0]' (uniform texture1D)
|
|
0:? 'g_texdata_array2[2].tex[1]' (uniform texture1D)
|
|
|
|
// Module Version 10000
|
|
// Generated by (magic number): 80001
|
|
// Id's are bound by 50
|
|
|
|
Capability Shader
|
|
Capability Sampled1D
|
|
1: ExtInstImport "GLSL.std.450"
|
|
MemoryModel Logical GLSL450
|
|
EntryPoint Fragment 4 "main" 9
|
|
ExecutionMode 4 OriginUpperLeft
|
|
Name 4 "main"
|
|
Name 9 "color"
|
|
Name 12 "tex"
|
|
Name 16 "samp"
|
|
Name 22 "g_texdata_array[1].tex"
|
|
Name 24 "g_texdata_array[1].samp"
|
|
Name 30 "g_texdata_array2[1].tex[0]"
|
|
Name 32 "g_texdata_array2[1].samp[0]"
|
|
Name 38 "g_samp"
|
|
Name 39 "g_tex"
|
|
Name 40 "g_texdata_array2[0].samp[0]"
|
|
Name 41 "g_texdata_array2[0].samp[1]"
|
|
Name 42 "g_texdata_array2[0].tex[0]"
|
|
Name 43 "g_texdata_array2[0].tex[1]"
|
|
Name 44 "g_texdata_array2[1].samp[1]"
|
|
Name 45 "g_texdata_array2[1].tex[1]"
|
|
Name 46 "g_texdata_array2[2].samp[0]"
|
|
Name 47 "g_texdata_array2[2].samp[1]"
|
|
Name 48 "g_texdata_array2[2].tex[0]"
|
|
Name 49 "g_texdata_array2[2].tex[1]"
|
|
Decorate 9(color) Location 0
|
|
Decorate 12(tex) DescriptorSet 0
|
|
Decorate 16(samp) DescriptorSet 0
|
|
Decorate 22(g_texdata_array[1].tex) DescriptorSet 0
|
|
Decorate 24(g_texdata_array[1].samp) DescriptorSet 0
|
|
Decorate 30(g_texdata_array2[1].tex[0]) DescriptorSet 0
|
|
Decorate 32(g_texdata_array2[1].samp[0]) DescriptorSet 0
|
|
Decorate 38(g_samp) DescriptorSet 0
|
|
Decorate 39(g_tex) DescriptorSet 0
|
|
Decorate 40(g_texdata_array2[0].samp[0]) DescriptorSet 0
|
|
Decorate 41(g_texdata_array2[0].samp[1]) DescriptorSet 0
|
|
Decorate 42(g_texdata_array2[0].tex[0]) DescriptorSet 0
|
|
Decorate 43(g_texdata_array2[0].tex[1]) DescriptorSet 0
|
|
Decorate 44(g_texdata_array2[1].samp[1]) DescriptorSet 0
|
|
Decorate 45(g_texdata_array2[1].tex[1]) DescriptorSet 0
|
|
Decorate 46(g_texdata_array2[2].samp[0]) DescriptorSet 0
|
|
Decorate 47(g_texdata_array2[2].samp[1]) DescriptorSet 0
|
|
Decorate 48(g_texdata_array2[2].tex[0]) DescriptorSet 0
|
|
Decorate 49(g_texdata_array2[2].tex[1]) DescriptorSet 0
|
|
2: TypeVoid
|
|
3: TypeFunction 2
|
|
6: TypeFloat 32
|
|
7: TypeVector 6(float) 4
|
|
8: TypePointer Output 7(fvec4)
|
|
9(color): 8(ptr) Variable Output
|
|
10: TypeImage 6(float) 1D sampled format:Unknown
|
|
11: TypePointer UniformConstant 10
|
|
12(tex): 11(ptr) Variable UniformConstant
|
|
14: TypeSampler
|
|
15: TypePointer UniformConstant 14
|
|
16(samp): 15(ptr) Variable UniformConstant
|
|
18: TypeSampledImage 10
|
|
20: 6(float) Constant 1056964608
|
|
22(g_texdata_array[1].tex): 11(ptr) Variable UniformConstant
|
|
24(g_texdata_array[1].samp): 15(ptr) Variable UniformConstant
|
|
27: 6(float) Constant 1053609165
|
|
30(g_texdata_array2[1].tex[0]): 11(ptr) Variable UniformConstant
|
|
32(g_texdata_array2[1].samp[0]): 15(ptr) Variable UniformConstant
|
|
35: 6(float) Constant 1050253722
|
|
38(g_samp): 15(ptr) Variable UniformConstant
|
|
39(g_tex): 11(ptr) Variable UniformConstant
|
|
40(g_texdata_array2[0].samp[0]): 15(ptr) Variable UniformConstant
|
|
41(g_texdata_array2[0].samp[1]): 15(ptr) Variable UniformConstant
|
|
42(g_texdata_array2[0].tex[0]): 11(ptr) Variable UniformConstant
|
|
43(g_texdata_array2[0].tex[1]): 11(ptr) Variable UniformConstant
|
|
44(g_texdata_array2[1].samp[1]): 15(ptr) Variable UniformConstant
|
|
45(g_texdata_array2[1].tex[1]): 11(ptr) Variable UniformConstant
|
|
46(g_texdata_array2[2].samp[0]): 15(ptr) Variable UniformConstant
|
|
47(g_texdata_array2[2].samp[1]): 15(ptr) Variable UniformConstant
|
|
48(g_texdata_array2[2].tex[0]): 11(ptr) Variable UniformConstant
|
|
49(g_texdata_array2[2].tex[1]): 11(ptr) Variable UniformConstant
|
|
4(main): 2 Function None 3
|
|
5: Label
|
|
13: 10 Load 12(tex)
|
|
17: 14 Load 16(samp)
|
|
19: 18 SampledImage 13 17
|
|
21: 7(fvec4) ImageSampleImplicitLod 19 20
|
|
23: 10 Load 22(g_texdata_array[1].tex)
|
|
25: 14 Load 24(g_texdata_array[1].samp)
|
|
26: 18 SampledImage 23 25
|
|
28: 7(fvec4) ImageSampleImplicitLod 26 27
|
|
29: 7(fvec4) FAdd 21 28
|
|
31: 10 Load 30(g_texdata_array2[1].tex[0])
|
|
33: 14 Load 32(g_texdata_array2[1].samp[0])
|
|
34: 18 SampledImage 31 33
|
|
36: 7(fvec4) ImageSampleImplicitLod 34 35
|
|
37: 7(fvec4) FAdd 29 36
|
|
Store 9(color) 37
|
|
Return
|
|
FunctionEnd
|