Merge pull request #2647 from greg-lunarg/arg2
Do true SPV type check for function array arg linkage
This commit is contained in:
Greg Fischer
GitHub
commit
6fe560f74f
@ -5562,7 +5562,7 @@ spv::Id TGlslangToSpvTraverser::handleUserFunctionCall(const glslang::TIntermAgg
|
|||||||
++lValueCount;
|
++lValueCount;
|
||||||
} else {
|
} else {
|
||||||
// process r-value, which involves a copy for a type mismatch
|
// process r-value, which involves a copy for a type mismatch
|
||||||
if (function->getParamType(a) != convertGlslangToSpvType(*argTypes[a]) ||
|
if (function->getParamType(a) != builder.getTypeId(rValues[rValueCount]) ||
|
||||||
TranslatePrecisionDecoration(*argTypes[a]) != function->getParamPrecision(a))
|
TranslatePrecisionDecoration(*argTypes[a]) != function->getParamPrecision(a))
|
||||||
{
|
{
|
||||||
spv::Id argCopy = builder.createVariable(function->getParamPrecision(a), spv::StorageClassFunction, function->getParamType(a), "arg");
|
spv::Id argCopy = builder.createVariable(function->getParamPrecision(a), spv::StorageClassFunction, function->getParamType(a), "arg");
|
||||||
|
|||||||
@ -1,12 +1,12 @@
|
|||||||
spv.1.4.OpCopyLogical.funcall.frag
|
spv.1.4.OpCopyLogical.funcall.frag
|
||||||
// Module Version 10400
|
// Module Version 10400
|
||||||
// Generated by (magic number): 8000a
|
// Generated by (magic number): 8000a
|
||||||
// Id's are bound by 60
|
// Id's are bound by 59
|
||||||
|
|
||||||
Capability Shader
|
Capability Shader
|
||||||
1: ExtInstImport "GLSL.std.450"
|
1: ExtInstImport "GLSL.std.450"
|
||||||
MemoryModel Logical GLSL450
|
MemoryModel Logical GLSL450
|
||||||
EntryPoint Fragment 4 "main" 25 37
|
EntryPoint Fragment 4 "main" 25 36
|
||||||
ExecutionMode 4 OriginUpperLeft
|
ExecutionMode 4 OriginUpperLeft
|
||||||
Source GLSL 450
|
Source GLSL 450
|
||||||
Name 4 "main"
|
Name 4 "main"
|
||||||
@ -23,14 +23,12 @@ spv.1.4.OpCopyLogical.funcall.frag
|
|||||||
Name 23 "blockName"
|
Name 23 "blockName"
|
||||||
MemberName 23(blockName) 0 "s1"
|
MemberName 23(blockName) 0 "s1"
|
||||||
Name 25 ""
|
Name 25 ""
|
||||||
Name 31 "S"
|
Name 31 "arg"
|
||||||
MemberName 31(S) 0 "m"
|
Name 36 "s2"
|
||||||
Name 32 "arg"
|
Name 39 "param"
|
||||||
Name 37 "s2"
|
Name 44 "param"
|
||||||
Name 40 "param"
|
Name 47 "param"
|
||||||
Name 45 "param"
|
Name 55 "param"
|
||||||
Name 48 "param"
|
|
||||||
Name 56 "param"
|
|
||||||
MemberDecorate 22(S) 0 ColMajor
|
MemberDecorate 22(S) 0 ColMajor
|
||||||
MemberDecorate 22(S) 0 Offset 0
|
MemberDecorate 22(S) 0 Offset 0
|
||||||
MemberDecorate 22(S) 0 MatrixStride 16
|
MemberDecorate 22(S) 0 MatrixStride 16
|
||||||
@ -38,7 +36,6 @@ spv.1.4.OpCopyLogical.funcall.frag
|
|||||||
Decorate 23(blockName) Block
|
Decorate 23(blockName) Block
|
||||||
Decorate 25 DescriptorSet 0
|
Decorate 25 DescriptorSet 0
|
||||||
Decorate 25 Binding 0
|
Decorate 25 Binding 0
|
||||||
MemberDecorate 31(S) 0 ColMajor
|
|
||||||
2: TypeVoid
|
2: TypeVoid
|
||||||
3: TypeFunction 2
|
3: TypeFunction 2
|
||||||
6: TypeFloat 32
|
6: TypeFloat 32
|
||||||
@ -55,46 +52,45 @@ spv.1.4.OpCopyLogical.funcall.frag
|
|||||||
26: TypeInt 32 1
|
26: TypeInt 32 1
|
||||||
27: 26(int) Constant 0
|
27: 26(int) Constant 0
|
||||||
28: TypePointer StorageBuffer 22(S)
|
28: TypePointer StorageBuffer 22(S)
|
||||||
31(S): TypeStruct 8
|
35: TypePointer Private 9(S)
|
||||||
36: TypePointer Private 9(S)
|
36(s2): 35(ptr) Variable Private
|
||||||
37(s2): 36(ptr) Variable Private
|
|
||||||
4(main): 2 Function None 3
|
4(main): 2 Function None 3
|
||||||
5: Label
|
5: Label
|
||||||
32(arg): 14(ptr) Variable Function
|
31(arg): 14(ptr) Variable Function
|
||||||
40(param): 14(ptr) Variable Function
|
39(param): 14(ptr) Variable Function
|
||||||
45(param): 14(ptr) Variable Function
|
44(param): 14(ptr) Variable Function
|
||||||
48(param): 14(ptr) Variable Function
|
47(param): 14(ptr) Variable Function
|
||||||
56(param): 14(ptr) Variable Function
|
55(param): 14(ptr) Variable Function
|
||||||
29: 28(ptr) AccessChain 25 27
|
29: 28(ptr) AccessChain 25 27
|
||||||
30: 22(S) Load 29
|
30: 22(S) Load 29
|
||||||
33: 9(S) CopyLogical 30
|
32: 9(S) CopyLogical 30
|
||||||
Store 32(arg) 33
|
Store 31(arg) 32
|
||||||
34: 9(S) Load 32(arg)
|
33: 9(S) Load 31(arg)
|
||||||
35: 2 FunctionCall 12(fooConst(struct-S-mf441;) 34
|
34: 2 FunctionCall 12(fooConst(struct-S-mf441;) 33
|
||||||
38: 9(S) Load 37(s2)
|
37: 9(S) Load 36(s2)
|
||||||
39: 2 FunctionCall 12(fooConst(struct-S-mf441;) 38
|
38: 2 FunctionCall 12(fooConst(struct-S-mf441;) 37
|
||||||
41: 28(ptr) AccessChain 25 27
|
40: 28(ptr) AccessChain 25 27
|
||||||
42: 22(S) Load 41
|
41: 22(S) Load 40
|
||||||
43: 9(S) CopyLogical 42
|
42: 9(S) CopyLogical 41
|
||||||
Store 40(param) 43
|
Store 39(param) 42
|
||||||
44: 2 FunctionCall 17(foo(struct-S-mf441;) 40(param)
|
43: 2 FunctionCall 17(foo(struct-S-mf441;) 39(param)
|
||||||
46: 9(S) Load 37(s2)
|
45: 9(S) Load 36(s2)
|
||||||
Store 45(param) 46
|
Store 44(param) 45
|
||||||
47: 2 FunctionCall 17(foo(struct-S-mf441;) 45(param)
|
46: 2 FunctionCall 17(foo(struct-S-mf441;) 44(param)
|
||||||
49: 28(ptr) AccessChain 25 27
|
48: 28(ptr) AccessChain 25 27
|
||||||
50: 22(S) Load 49
|
49: 22(S) Load 48
|
||||||
51: 9(S) CopyLogical 50
|
50: 9(S) CopyLogical 49
|
||||||
Store 48(param) 51
|
Store 47(param) 50
|
||||||
52: 2 FunctionCall 20(fooOut(struct-S-mf441;) 48(param)
|
51: 2 FunctionCall 20(fooOut(struct-S-mf441;) 47(param)
|
||||||
53: 9(S) Load 48(param)
|
52: 9(S) Load 47(param)
|
||||||
54: 28(ptr) AccessChain 25 27
|
53: 28(ptr) AccessChain 25 27
|
||||||
55: 22(S) CopyLogical 53
|
54: 22(S) CopyLogical 52
|
||||||
Store 54 55
|
Store 53 54
|
||||||
57: 9(S) Load 37(s2)
|
56: 9(S) Load 36(s2)
|
||||||
Store 56(param) 57
|
Store 55(param) 56
|
||||||
58: 2 FunctionCall 20(fooOut(struct-S-mf441;) 56(param)
|
57: 2 FunctionCall 20(fooOut(struct-S-mf441;) 55(param)
|
||||||
59: 9(S) Load 56(param)
|
58: 9(S) Load 55(param)
|
||||||
Store 37(s2) 59
|
Store 36(s2) 58
|
||||||
Return
|
Return
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
12(fooConst(struct-S-mf441;): 2 Function None 10
|
12(fooConst(struct-S-mf441;): 2 Function None 10
|
||||||
|
|||||||
74
Test/baseResults/spv.1.4.funcall.array.frag.out
Normal file
74
Test/baseResults/spv.1.4.funcall.array.frag.out
Normal file
@ -0,0 +1,74 @@
|
|||||||
|
spv.1.4.funcall.array.frag
|
||||||
|
// Module Version 10400
|
||||||
|
// Generated by (magic number): 8000a
|
||||||
|
// Id's are bound by 42
|
||||||
|
|
||||||
|
Capability Shader
|
||||||
|
1: ExtInstImport "GLSL.std.450"
|
||||||
|
MemoryModel Logical GLSL450
|
||||||
|
EntryPoint Fragment 4 "main" 27 31
|
||||||
|
ExecutionMode 4 OriginUpperLeft
|
||||||
|
Source GLSL 450
|
||||||
|
Name 4 "main"
|
||||||
|
Name 16 "f(vf4[9];i1;"
|
||||||
|
Name 14 "a"
|
||||||
|
Name 15 "ix"
|
||||||
|
Name 20 "indexable"
|
||||||
|
Name 27 "color"
|
||||||
|
Name 29 "ub"
|
||||||
|
MemberName 29(ub) 0 "u"
|
||||||
|
Name 31 ""
|
||||||
|
Name 37 "arg"
|
||||||
|
Name 40 "param"
|
||||||
|
Decorate 27(color) Location 0
|
||||||
|
Decorate 28 ArrayStride 16
|
||||||
|
MemberDecorate 29(ub) 0 Offset 0
|
||||||
|
Decorate 29(ub) Block
|
||||||
|
Decorate 31 DescriptorSet 0
|
||||||
|
Decorate 31 Binding 0
|
||||||
|
2: TypeVoid
|
||||||
|
3: TypeFunction 2
|
||||||
|
6: TypeFloat 32
|
||||||
|
7: TypeVector 6(float) 4
|
||||||
|
8: TypeInt 32 0
|
||||||
|
9: 8(int) Constant 9
|
||||||
|
10: TypeArray 7(fvec4) 9
|
||||||
|
11: TypeInt 32 1
|
||||||
|
12: TypePointer Function 11(int)
|
||||||
|
13: TypeFunction 7(fvec4) 10 12(ptr)
|
||||||
|
19: TypePointer Function 10
|
||||||
|
21: TypePointer Function 7(fvec4)
|
||||||
|
26: TypePointer Output 7(fvec4)
|
||||||
|
27(color): 26(ptr) Variable Output
|
||||||
|
28: TypeArray 7(fvec4) 9
|
||||||
|
29(ub): TypeStruct 28
|
||||||
|
30: TypePointer Uniform 29(ub)
|
||||||
|
31: 30(ptr) Variable Uniform
|
||||||
|
32: 11(int) Constant 0
|
||||||
|
33: TypePointer Uniform 28
|
||||||
|
36: 11(int) Constant 2
|
||||||
|
4(main): 2 Function None 3
|
||||||
|
5: Label
|
||||||
|
37(arg): 19(ptr) Variable Function
|
||||||
|
40(param): 12(ptr) Variable Function
|
||||||
|
34: 33(ptr) AccessChain 31 32
|
||||||
|
35: 28 Load 34
|
||||||
|
38: 10 CopyLogical 35
|
||||||
|
Store 37(arg) 38
|
||||||
|
39: 10 Load 37(arg)
|
||||||
|
Store 40(param) 36
|
||||||
|
41: 7(fvec4) FunctionCall 16(f(vf4[9];i1;) 39 40(param)
|
||||||
|
Store 27(color) 41
|
||||||
|
Return
|
||||||
|
FunctionEnd
|
||||||
|
16(f(vf4[9];i1;): 7(fvec4) Function None 13
|
||||||
|
14(a): 10 FunctionParameter
|
||||||
|
15(ix): 12(ptr) FunctionParameter
|
||||||
|
17: Label
|
||||||
|
20(indexable): 19(ptr) Variable Function
|
||||||
|
18: 11(int) Load 15(ix)
|
||||||
|
Store 20(indexable) 14(a)
|
||||||
|
22: 21(ptr) AccessChain 20(indexable) 18
|
||||||
|
23: 7(fvec4) Load 22
|
||||||
|
ReturnValue 23
|
||||||
|
FunctionEnd
|
||||||
106
Test/baseResults/spv.funcall.array.frag.out
Normal file
106
Test/baseResults/spv.funcall.array.frag.out
Normal file
@ -0,0 +1,106 @@
|
|||||||
|
spv.funcall.array.frag
|
||||||
|
// Module Version 10000
|
||||||
|
// Generated by (magic number): 8000a
|
||||||
|
// Id's are bound by 66
|
||||||
|
|
||||||
|
Capability Shader
|
||||||
|
1: ExtInstImport "GLSL.std.450"
|
||||||
|
MemoryModel Logical GLSL450
|
||||||
|
EntryPoint Fragment 4 "main" 27
|
||||||
|
ExecutionMode 4 OriginUpperLeft
|
||||||
|
Source GLSL 450
|
||||||
|
Name 4 "main"
|
||||||
|
Name 16 "f(vf4[9];i1;"
|
||||||
|
Name 14 "a"
|
||||||
|
Name 15 "ix"
|
||||||
|
Name 20 "indexable"
|
||||||
|
Name 27 "color"
|
||||||
|
Name 29 "ub"
|
||||||
|
MemberName 29(ub) 0 "u"
|
||||||
|
Name 31 ""
|
||||||
|
Name 37 "arg"
|
||||||
|
Name 64 "param"
|
||||||
|
Decorate 27(color) Location 0
|
||||||
|
Decorate 28 ArrayStride 16
|
||||||
|
MemberDecorate 29(ub) 0 Offset 0
|
||||||
|
Decorate 29(ub) Block
|
||||||
|
Decorate 31 DescriptorSet 0
|
||||||
|
Decorate 31 Binding 0
|
||||||
|
2: TypeVoid
|
||||||
|
3: TypeFunction 2
|
||||||
|
6: TypeFloat 32
|
||||||
|
7: TypeVector 6(float) 4
|
||||||
|
8: TypeInt 32 0
|
||||||
|
9: 8(int) Constant 9
|
||||||
|
10: TypeArray 7(fvec4) 9
|
||||||
|
11: TypeInt 32 1
|
||||||
|
12: TypePointer Function 11(int)
|
||||||
|
13: TypeFunction 7(fvec4) 10 12(ptr)
|
||||||
|
19: TypePointer Function 10
|
||||||
|
21: TypePointer Function 7(fvec4)
|
||||||
|
26: TypePointer Output 7(fvec4)
|
||||||
|
27(color): 26(ptr) Variable Output
|
||||||
|
28: TypeArray 7(fvec4) 9
|
||||||
|
29(ub): TypeStruct 28
|
||||||
|
30: TypePointer Uniform 29(ub)
|
||||||
|
31: 30(ptr) Variable Uniform
|
||||||
|
32: 11(int) Constant 0
|
||||||
|
33: TypePointer Uniform 28
|
||||||
|
36: 11(int) Constant 2
|
||||||
|
41: 11(int) Constant 1
|
||||||
|
46: 11(int) Constant 3
|
||||||
|
49: 11(int) Constant 4
|
||||||
|
52: 11(int) Constant 5
|
||||||
|
55: 11(int) Constant 6
|
||||||
|
58: 11(int) Constant 7
|
||||||
|
61: 11(int) Constant 8
|
||||||
|
4(main): 2 Function None 3
|
||||||
|
5: Label
|
||||||
|
37(arg): 19(ptr) Variable Function
|
||||||
|
64(param): 12(ptr) Variable Function
|
||||||
|
34: 33(ptr) AccessChain 31 32
|
||||||
|
35: 28 Load 34
|
||||||
|
38: 7(fvec4) CompositeExtract 35 0
|
||||||
|
39: 21(ptr) AccessChain 37(arg) 32
|
||||||
|
Store 39 38
|
||||||
|
40: 7(fvec4) CompositeExtract 35 1
|
||||||
|
42: 21(ptr) AccessChain 37(arg) 41
|
||||||
|
Store 42 40
|
||||||
|
43: 7(fvec4) CompositeExtract 35 2
|
||||||
|
44: 21(ptr) AccessChain 37(arg) 36
|
||||||
|
Store 44 43
|
||||||
|
45: 7(fvec4) CompositeExtract 35 3
|
||||||
|
47: 21(ptr) AccessChain 37(arg) 46
|
||||||
|
Store 47 45
|
||||||
|
48: 7(fvec4) CompositeExtract 35 4
|
||||||
|
50: 21(ptr) AccessChain 37(arg) 49
|
||||||
|
Store 50 48
|
||||||
|
51: 7(fvec4) CompositeExtract 35 5
|
||||||
|
53: 21(ptr) AccessChain 37(arg) 52
|
||||||
|
Store 53 51
|
||||||
|
54: 7(fvec4) CompositeExtract 35 6
|
||||||
|
56: 21(ptr) AccessChain 37(arg) 55
|
||||||
|
Store 56 54
|
||||||
|
57: 7(fvec4) CompositeExtract 35 7
|
||||||
|
59: 21(ptr) AccessChain 37(arg) 58
|
||||||
|
Store 59 57
|
||||||
|
60: 7(fvec4) CompositeExtract 35 8
|
||||||
|
62: 21(ptr) AccessChain 37(arg) 61
|
||||||
|
Store 62 60
|
||||||
|
63: 10 Load 37(arg)
|
||||||
|
Store 64(param) 36
|
||||||
|
65: 7(fvec4) FunctionCall 16(f(vf4[9];i1;) 63 64(param)
|
||||||
|
Store 27(color) 65
|
||||||
|
Return
|
||||||
|
FunctionEnd
|
||||||
|
16(f(vf4[9];i1;): 7(fvec4) Function None 13
|
||||||
|
14(a): 10 FunctionParameter
|
||||||
|
15(ix): 12(ptr) FunctionParameter
|
||||||
|
17: Label
|
||||||
|
20(indexable): 19(ptr) Variable Function
|
||||||
|
18: 11(int) Load 15(ix)
|
||||||
|
Store 20(indexable) 14(a)
|
||||||
|
22: 21(ptr) AccessChain 20(indexable) 18
|
||||||
|
23: 7(fvec4) Load 22
|
||||||
|
ReturnValue 23
|
||||||
|
FunctionEnd
|
||||||
@ -1,7 +1,7 @@
|
|||||||
spv.multiStructFuncall.frag
|
spv.multiStructFuncall.frag
|
||||||
// Module Version 10000
|
// Module Version 10000
|
||||||
// Generated by (magic number): 8000a
|
// Generated by (magic number): 8000a
|
||||||
// Id's are bound by 66
|
// Id's are bound by 65
|
||||||
|
|
||||||
Capability Shader
|
Capability Shader
|
||||||
1: ExtInstImport "GLSL.std.450"
|
1: ExtInstImport "GLSL.std.450"
|
||||||
@ -23,14 +23,12 @@ spv.multiStructFuncall.frag
|
|||||||
Name 23 "blockName"
|
Name 23 "blockName"
|
||||||
MemberName 23(blockName) 0 "s1"
|
MemberName 23(blockName) 0 "s1"
|
||||||
Name 25 ""
|
Name 25 ""
|
||||||
Name 31 "S"
|
Name 31 "arg"
|
||||||
MemberName 31(S) 0 "m"
|
Name 38 "s2"
|
||||||
Name 32 "arg"
|
Name 41 "param"
|
||||||
Name 39 "s2"
|
Name 47 "param"
|
||||||
Name 42 "param"
|
Name 50 "param"
|
||||||
Name 48 "param"
|
Name 61 "param"
|
||||||
Name 51 "param"
|
|
||||||
Name 62 "param"
|
|
||||||
MemberDecorate 22(S) 0 ColMajor
|
MemberDecorate 22(S) 0 ColMajor
|
||||||
MemberDecorate 22(S) 0 Offset 0
|
MemberDecorate 22(S) 0 Offset 0
|
||||||
MemberDecorate 22(S) 0 MatrixStride 16
|
MemberDecorate 22(S) 0 MatrixStride 16
|
||||||
@ -38,7 +36,6 @@ spv.multiStructFuncall.frag
|
|||||||
Decorate 23(blockName) BufferBlock
|
Decorate 23(blockName) BufferBlock
|
||||||
Decorate 25 DescriptorSet 0
|
Decorate 25 DescriptorSet 0
|
||||||
Decorate 25 Binding 0
|
Decorate 25 Binding 0
|
||||||
MemberDecorate 31(S) 0 ColMajor
|
|
||||||
2: TypeVoid
|
2: TypeVoid
|
||||||
3: TypeFunction 2
|
3: TypeFunction 2
|
||||||
6: TypeFloat 32
|
6: TypeFloat 32
|
||||||
@ -55,52 +52,51 @@ spv.multiStructFuncall.frag
|
|||||||
26: TypeInt 32 1
|
26: TypeInt 32 1
|
||||||
27: 26(int) Constant 0
|
27: 26(int) Constant 0
|
||||||
28: TypePointer Uniform 22(S)
|
28: TypePointer Uniform 22(S)
|
||||||
31(S): TypeStruct 8
|
33: TypePointer Function 8
|
||||||
34: TypePointer Function 8
|
37: TypePointer Private 9(S)
|
||||||
38: TypePointer Private 9(S)
|
38(s2): 37(ptr) Variable Private
|
||||||
39(s2): 38(ptr) Variable Private
|
59: TypePointer Uniform 8
|
||||||
60: TypePointer Uniform 8
|
|
||||||
4(main): 2 Function None 3
|
4(main): 2 Function None 3
|
||||||
5: Label
|
5: Label
|
||||||
32(arg): 14(ptr) Variable Function
|
31(arg): 14(ptr) Variable Function
|
||||||
42(param): 14(ptr) Variable Function
|
41(param): 14(ptr) Variable Function
|
||||||
48(param): 14(ptr) Variable Function
|
47(param): 14(ptr) Variable Function
|
||||||
51(param): 14(ptr) Variable Function
|
50(param): 14(ptr) Variable Function
|
||||||
62(param): 14(ptr) Variable Function
|
61(param): 14(ptr) Variable Function
|
||||||
29: 28(ptr) AccessChain 25 27
|
29: 28(ptr) AccessChain 25 27
|
||||||
30: 22(S) Load 29
|
30: 22(S) Load 29
|
||||||
33: 8 CompositeExtract 30 0
|
32: 8 CompositeExtract 30 0
|
||||||
35: 34(ptr) AccessChain 32(arg) 27
|
34: 33(ptr) AccessChain 31(arg) 27
|
||||||
Store 35 33
|
Store 34 32
|
||||||
36: 9(S) Load 32(arg)
|
35: 9(S) Load 31(arg)
|
||||||
37: 2 FunctionCall 12(fooConst(struct-S-mf441;) 36
|
36: 2 FunctionCall 12(fooConst(struct-S-mf441;) 35
|
||||||
40: 9(S) Load 39(s2)
|
39: 9(S) Load 38(s2)
|
||||||
41: 2 FunctionCall 12(fooConst(struct-S-mf441;) 40
|
40: 2 FunctionCall 12(fooConst(struct-S-mf441;) 39
|
||||||
43: 28(ptr) AccessChain 25 27
|
42: 28(ptr) AccessChain 25 27
|
||||||
44: 22(S) Load 43
|
43: 22(S) Load 42
|
||||||
45: 8 CompositeExtract 44 0
|
44: 8 CompositeExtract 43 0
|
||||||
46: 34(ptr) AccessChain 42(param) 27
|
45: 33(ptr) AccessChain 41(param) 27
|
||||||
Store 46 45
|
Store 45 44
|
||||||
47: 2 FunctionCall 17(foo(struct-S-mf441;) 42(param)
|
46: 2 FunctionCall 17(foo(struct-S-mf441;) 41(param)
|
||||||
49: 9(S) Load 39(s2)
|
48: 9(S) Load 38(s2)
|
||||||
Store 48(param) 49
|
Store 47(param) 48
|
||||||
50: 2 FunctionCall 17(foo(struct-S-mf441;) 48(param)
|
49: 2 FunctionCall 17(foo(struct-S-mf441;) 47(param)
|
||||||
52: 28(ptr) AccessChain 25 27
|
51: 28(ptr) AccessChain 25 27
|
||||||
53: 22(S) Load 52
|
52: 22(S) Load 51
|
||||||
54: 8 CompositeExtract 53 0
|
53: 8 CompositeExtract 52 0
|
||||||
55: 34(ptr) AccessChain 51(param) 27
|
54: 33(ptr) AccessChain 50(param) 27
|
||||||
Store 55 54
|
Store 54 53
|
||||||
56: 2 FunctionCall 20(fooOut(struct-S-mf441;) 51(param)
|
55: 2 FunctionCall 20(fooOut(struct-S-mf441;) 50(param)
|
||||||
57: 9(S) Load 51(param)
|
56: 9(S) Load 50(param)
|
||||||
58: 28(ptr) AccessChain 25 27
|
57: 28(ptr) AccessChain 25 27
|
||||||
59: 8 CompositeExtract 57 0
|
58: 8 CompositeExtract 56 0
|
||||||
61: 60(ptr) AccessChain 58 27
|
60: 59(ptr) AccessChain 57 27
|
||||||
Store 61 59
|
Store 60 58
|
||||||
63: 9(S) Load 39(s2)
|
62: 9(S) Load 38(s2)
|
||||||
Store 62(param) 63
|
Store 61(param) 62
|
||||||
64: 2 FunctionCall 20(fooOut(struct-S-mf441;) 62(param)
|
63: 2 FunctionCall 20(fooOut(struct-S-mf441;) 61(param)
|
||||||
65: 9(S) Load 62(param)
|
64: 9(S) Load 61(param)
|
||||||
Store 39(s2) 65
|
Store 38(s2) 64
|
||||||
Return
|
Return
|
||||||
FunctionEnd
|
FunctionEnd
|
||||||
12(fooConst(struct-S-mf441;): 2 Function None 10
|
12(fooConst(struct-S-mf441;): 2 Function None 10
|
||||||
|
|||||||
17
Test/spv.1.4.funcall.array.frag
Normal file
17
Test/spv.1.4.funcall.array.frag
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
#version 450 core
|
||||||
|
|
||||||
|
uniform ub {
|
||||||
|
vec4 u[9];
|
||||||
|
};
|
||||||
|
|
||||||
|
vec4 f(const vec4 a[9], int ix) {
|
||||||
|
return a[ix];
|
||||||
|
}
|
||||||
|
|
||||||
|
out vec4 color;
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
color = f(u, 2);
|
||||||
|
}
|
||||||
|
|
||||||
17
Test/spv.funcall.array.frag
Normal file
17
Test/spv.funcall.array.frag
Normal file
@ -0,0 +1,17 @@
|
|||||||
|
#version 450 core
|
||||||
|
|
||||||
|
uniform ub {
|
||||||
|
vec4 u[9];
|
||||||
|
};
|
||||||
|
|
||||||
|
vec4 f(const vec4 a[9], int ix) {
|
||||||
|
return a[ix];
|
||||||
|
}
|
||||||
|
|
||||||
|
out vec4 color;
|
||||||
|
|
||||||
|
void main()
|
||||||
|
{
|
||||||
|
color = f(u, 2);
|
||||||
|
}
|
||||||
|
|
||||||
@ -351,6 +351,7 @@ INSTANTIATE_TEST_SUITE_P(
|
|||||||
"spv.functionSemantics.frag",
|
"spv.functionSemantics.frag",
|
||||||
"spv.functionParameterTypes.frag",
|
"spv.functionParameterTypes.frag",
|
||||||
"spv.GeometryShaderPassthrough.geom",
|
"spv.GeometryShaderPassthrough.geom",
|
||||||
|
"spv.funcall.array.frag",
|
||||||
"spv.interpOps.frag",
|
"spv.interpOps.frag",
|
||||||
"spv.int64.frag",
|
"spv.int64.frag",
|
||||||
"spv.intcoopmat.comp",
|
"spv.intcoopmat.comp",
|
||||||
@ -555,6 +556,7 @@ INSTANTIATE_TEST_SUITE_P(
|
|||||||
"spv.1.4.OpCopyLogical.comp",
|
"spv.1.4.OpCopyLogical.comp",
|
||||||
"spv.1.4.OpCopyLogicalBool.comp",
|
"spv.1.4.OpCopyLogicalBool.comp",
|
||||||
"spv.1.4.OpCopyLogical.funcall.frag",
|
"spv.1.4.OpCopyLogical.funcall.frag",
|
||||||
|
"spv.1.4.funcall.array.frag",
|
||||||
"spv.1.4.image.frag",
|
"spv.1.4.image.frag",
|
||||||
"spv.1.4.sparseTexture.frag",
|
"spv.1.4.sparseTexture.frag",
|
||||||
"spv.1.4.texture.frag",
|
"spv.1.4.texture.frag",
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user