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

Merge pull request #931 from LoopDawg/scalar-mat-assign

Browse Source 
HLSL: fix several issues in mat construction from scalars
This commit is contained in:
John Kessenich 2017-06-14 15:02:01 -06:00 committed by GitHub
commit 2d46e73b35
7 changed files with 617 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Test/baseResults/hlsl.intrinsics.negative.frag.out
View File

@ -1,10 +1,10 @@
hlsl.intrinsics.negative.frag hlsl.intrinsics.negative.frag
ERROR: 0:10: 'determinant' : no matching overloaded function found ERROR: 0:10: 'determinant' : ambiguous best function under implicit type conversion
ERROR: 0:25: 'normalize' : ambiguous best function under implicit type conversion ERROR: 0:25: 'normalize' : ambiguous best function under implicit type conversion
ERROR: 0:26: 'reflect' : ambiguous best function under implicit type conversion ERROR: 0:26: 'reflect' : ambiguous best function under implicit type conversion
ERROR: 0:27: 'refract' : ambiguous best function under implicit type conversion ERROR: 0:27: 'refract' : ambiguous best function under implicit type conversion
ERROR: 0:28: 'refract' : no matching overloaded function found ERROR: 0:28: 'refract' : no matching overloaded function found
ERROR: 0:30: 'transpose' : no matching overloaded function found ERROR: 0:30: 'transpose' : ambiguous best function under implicit type conversion
ERROR: 0:39: 'GetRenderTargetSamplePosition' : no matching overloaded function found ERROR: 0:39: 'GetRenderTargetSamplePosition' : no matching overloaded function found
ERROR: 0:46: 'asdouble' : double2 conversion not implemented ERROR: 0:46: 'asdouble' : double2 conversion not implemented
ERROR: 0:47: 'CheckAccessFullyMapped' : no matching overloaded function found ERROR: 0:47: 'CheckAccessFullyMapped' : no matching overloaded function found
@ -104,8 +104,9 @@ ERROR: node is still EOpNull!
0:9 0 (const int) 0:9 0 (const int)
0:9 Constant: 0:9 Constant:
0:9 3 (const int) 0:9 3 (const int)
0:10 Constant: 0:10 determinant ( temp float)
0:10 0.000000 ERROR: node is still EOpNull!
0:10 'inF0' ( in float)
0:12 direct index ( temp float) 0:12 direct index ( temp float)
0:12 unpackHalf2x16 ( temp 2-component vector of float) 0:12 unpackHalf2x16 ( temp 2-component vector of float)
0:12 Convert float to uint ( temp uint) 0:12 Convert float to uint ( temp uint)
@ -150,8 +151,9 @@ ERROR: node is still EOpNull!
0:29 bitFieldReverse ( temp uint) 0:29 bitFieldReverse ( temp uint)
0:29 Convert float to uint ( temp uint) 0:29 Convert float to uint ( temp uint)
0:29 'inF0' ( in float) 0:29 'inF0' ( in float)
0:30 Constant: 0:30 transpose ( temp 1X1 matrix of float)
0:30 0.000000 ERROR: node is still EOpNull!
0:30 'inF0' ( in float)
0:32 Branch: Return with expression 0:32 Branch: Return with expression
0:32 Constant: 0:32 Constant:
0:32 0.000000 0:32 0.000000
@ -565,8 +567,9 @@ ERROR: node is still EOpNull!
0:9 0 (const int) 0:9 0 (const int)
0:9 Constant: 0:9 Constant:
0:9 3 (const int) 0:9 3 (const int)
0:10 Constant: 0:10 determinant ( temp float)
0:10 0.000000 ERROR: node is still EOpNull!
0:10 'inF0' ( in float)
0:12 direct index ( temp float) 0:12 direct index ( temp float)
0:12 unpackHalf2x16 ( temp 2-component vector of float) 0:12 unpackHalf2x16 ( temp 2-component vector of float)
0:12 Convert float to uint ( temp uint) 0:12 Convert float to uint ( temp uint)
@ -611,8 +614,9 @@ ERROR: node is still EOpNull!
0:29 bitFieldReverse ( temp uint) 0:29 bitFieldReverse ( temp uint)
0:29 Convert float to uint ( temp uint) 0:29 Convert float to uint ( temp uint)
0:29 'inF0' ( in float) 0:29 'inF0' ( in float)
0:30 Constant: 0:30 transpose ( temp 1X1 matrix of float)
0:30 0.000000 ERROR: node is still EOpNull!
0:30 'inF0' ( in float)
0:32 Branch: Return with expression 0:32 Branch: Return with expression
0:32 Constant: 0:32 Constant:
0:32 0.000000 0:32 0.000000

506
Test/baseResults/hlsl.scalar2matrix.frag.out Normal file
View File

@ -0,0 +1,506 @@
hlsl.scalar2matrix.frag
Shader version: 500
gl_FragCoord origin is upper left
0:? Sequence
0:2 Function Definition: Fn1(mf44; ( temp void)
0:2 Function Parameters:
0:2 'p' ( in 4X4 matrix of float)
0:5 Function Definition: @main( ( temp 4-component vector of float)
0:5 Function Parameters:
0:? Sequence
0:10 Sequence
0:10 move second child to first child ( temp 4X4 matrix of float)
0:10 'mat1' ( temp 4X4 matrix of float)
0:10 Constant:
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:11 Sequence
0:11 move second child to first child ( temp 4X4 matrix of float)
0:11 'mat2' ( temp 4X4 matrix of float)
0:11 Constant:
0:11 3.000000
0:11 3.100000
0:11 3.200000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:12 Sequence
0:12 move second child to first child ( temp 4X4 matrix of float)
0:12 'mat3' ( temp 4X4 matrix of float)
0:12 Constant:
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:16 move second child to first child ( temp 4X4 matrix of float)
0:16 'mat4' ( temp 4X4 matrix of float)
0:16 Constant:
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:17 move second child to first child ( temp 4X4 matrix of float)
0:17 'mat4' ( temp 4X4 matrix of float)
0:? Constant:
0:? 4.000000
0:? 4.100000
0:? 4.200000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:18 move second child to first child ( temp 4X4 matrix of float)
0:18 'mat4' ( temp 4X4 matrix of float)
0:18 Constant:
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:20 matrix scale second child into first child ( temp 4X4 matrix of float)
0:20 'mat4' ( temp 4X4 matrix of float)
0:20 Constant:
0:20 0.750000
0:21 add second child into first child ( temp 4X4 matrix of float)
0:21 'mat4' ( temp 4X4 matrix of float)
0:21 Constant:
0:21 0.750000
0:22 subtract second child into first child ( temp 4X4 matrix of float)
0:22 'mat4' ( temp 4X4 matrix of float)
0:22 Constant:
0:22 0.500000
0:23 divide second child into first child ( temp 4X4 matrix of float)
0:23 'mat4' ( temp 4X4 matrix of float)
0:23 Constant:
0:23 2.000000
0:25 Function Call: Fn1(mf44; ( temp void)
0:25 Constant:
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:27 Branch: Return with expression
0:27 add ( temp 4-component vector of float)
0:27 add ( temp 4-component vector of float)
0:27 Constant:
0:27 0.300000
0:27 0.300000
0:27 0.300000
0:27 0.300000
0:27 direct index ( temp 4-component vector of float)
0:27 'mat1' ( temp 4X4 matrix of float)
0:27 Constant:
0:27 1 (const int)
0:27 direct index ( temp 4-component vector of float)
0:27 'mat4' ( temp 4X4 matrix of float)
0:27 Constant:
0:27 2 (const int)
0:5 Function Definition: main( ( temp void)
0:5 Function Parameters:
0:? Sequence
0:5 move second child to first child ( temp 4-component vector of float)
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
0:5 Function Call: @main( ( temp 4-component vector of float)
0:? Linker Objects
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
Linked fragment stage:
Shader version: 500
gl_FragCoord origin is upper left
0:? Sequence
0:2 Function Definition: Fn1(mf44; ( temp void)
0:2 Function Parameters:
0:2 'p' ( in 4X4 matrix of float)
0:5 Function Definition: @main( ( temp 4-component vector of float)
0:5 Function Parameters:
0:? Sequence
0:10 Sequence
0:10 move second child to first child ( temp 4X4 matrix of float)
0:10 'mat1' ( temp 4X4 matrix of float)
0:10 Constant:
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:10 0.250000
0:11 Sequence
0:11 move second child to first child ( temp 4X4 matrix of float)
0:11 'mat2' ( temp 4X4 matrix of float)
0:11 Constant:
0:11 3.000000
0:11 3.100000
0:11 3.200000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:11 0.000000
0:12 Sequence
0:12 move second child to first child ( temp 4X4 matrix of float)
0:12 'mat3' ( temp 4X4 matrix of float)
0:12 Constant:
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:12 0.375000
0:16 move second child to first child ( temp 4X4 matrix of float)
0:16 'mat4' ( temp 4X4 matrix of float)
0:16 Constant:
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:16 0.750000
0:17 move second child to first child ( temp 4X4 matrix of float)
0:17 'mat4' ( temp 4X4 matrix of float)
0:? Constant:
0:? 4.000000
0:? 4.100000
0:? 4.200000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:? 0.000000
0:18 move second child to first child ( temp 4X4 matrix of float)
0:18 'mat4' ( temp 4X4 matrix of float)
0:18 Constant:
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:18 0.500000
0:20 matrix scale second child into first child ( temp 4X4 matrix of float)
0:20 'mat4' ( temp 4X4 matrix of float)
0:20 Constant:
0:20 0.750000
0:21 add second child into first child ( temp 4X4 matrix of float)
0:21 'mat4' ( temp 4X4 matrix of float)
0:21 Constant:
0:21 0.750000
0:22 subtract second child into first child ( temp 4X4 matrix of float)
0:22 'mat4' ( temp 4X4 matrix of float)
0:22 Constant:
0:22 0.500000
0:23 divide second child into first child ( temp 4X4 matrix of float)
0:23 'mat4' ( temp 4X4 matrix of float)
0:23 Constant:
0:23 2.000000
0:25 Function Call: Fn1(mf44; ( temp void)
0:25 Constant:
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:25 5.000000
0:27 Branch: Return with expression
0:27 add ( temp 4-component vector of float)
0:27 add ( temp 4-component vector of float)
0:27 Constant:
0:27 0.300000
0:27 0.300000
0:27 0.300000
0:27 0.300000
0:27 direct index ( temp 4-component vector of float)
0:27 'mat1' ( temp 4X4 matrix of float)
0:27 Constant:
0:27 1 (const int)
0:27 direct index ( temp 4-component vector of float)
0:27 'mat4' ( temp 4X4 matrix of float)
0:27 Constant:
0:27 2 (const int)
0:5 Function Definition: main( ( temp void)
0:5 Function Parameters:
0:? Sequence
0:5 move second child to first child ( temp 4-component vector of float)
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
0:5 Function Call: @main( ( temp 4-component vector of float)
0:? Linker Objects
0:? '@entryPointOutput' (layout( location=0) out 4-component vector of float)
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 96
Capability Shader
1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 94
ExecutionMode 4 OriginUpperLeft
Source HLSL 500
Name 4 "main"
Name 12 "Fn1(mf44;"
Name 11 "p"
Name 15 "@main("
Name 17 "mat1"
Name 21 "mat2"
Name 29 "mat3"
Name 33 "mat4"
Name 77 "param"
Name 94 "@entryPointOutput"
Decorate 94(@entryPointOutput) Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
7: TypeVector 6(float) 4
8: TypeMatrix 7(fvec4) 4
9: TypePointer Function 8
10: TypeFunction 2 9(ptr)
14: TypeFunction 7(fvec4)
18: 6(float) Constant 1048576000
19: 7(fvec4) ConstantComposite 18 18 18 18
20: 8 ConstantComposite 19 19 19 19
22: 6(float) Constant 1077936128
23: 6(float) Constant 1078355558
24: 6(float) Constant 1078774989
25: 6(float) Constant 0
26: 7(fvec4) ConstantComposite 22 23 24 25
27: 7(fvec4) ConstantComposite 25 25 25 25
28: 8 ConstantComposite 26 27 27 27
30: 6(float) Constant 1052770304
31: 7(fvec4) ConstantComposite 30 30 30 30
32: 8 ConstantComposite 31 31 31 31
34: 6(float) Constant 1061158912
35: 7(fvec4) ConstantComposite 34 34 34 34
36: 8 ConstantComposite 35 35 35 35
37: 6(float) Constant 1082130432
38: 6(float) Constant 1082340147
39: 6(float) Constant 1082549862
40: 7(fvec4) ConstantComposite 37 38 39 25
41: 8 ConstantComposite 40 27 27 27
42: 6(float) Constant 1056964608
43: 7(fvec4) ConstantComposite 42 42 42 42
44: 8 ConstantComposite 43 43 43 43
69: 6(float) Constant 1073741824
71: 6(float) Constant 1065353216
74: 6(float) Constant 1084227584
75: 7(fvec4) ConstantComposite 74 74 74 74
76: 8 ConstantComposite 75 75 75 75
79: 6(float) Constant 1050253722
80: 7(fvec4) ConstantComposite 79 79 79 79
81: TypeInt 32 1
82: 81(int) Constant 1
83: TypePointer Function 7(fvec4)
87: 81(int) Constant 2
93: TypePointer Output 7(fvec4)
94(@entryPointOutput): 93(ptr) Variable Output
4(main): 2 Function None 3
5: Label
95: 7(fvec4) FunctionCall 15(@main()
Store 94(@entryPointOutput) 95
Return
FunctionEnd
12(Fn1(mf44;): 2 Function None 10
11(p): 9(ptr) FunctionParameter
13: Label
Return
FunctionEnd
15(@main(): 7(fvec4) Function None 14
16: Label
17(mat1): 9(ptr) Variable Function
21(mat2): 9(ptr) Variable Function
29(mat3): 9(ptr) Variable Function
33(mat4): 9(ptr) Variable Function
77(param): 9(ptr) Variable Function
Store 17(mat1) 20
Store 21(mat2) 28
Store 29(mat3) 32
Store 33(mat4) 36
Store 33(mat4) 41
Store 33(mat4) 44
45: 8 Load 33(mat4)
46: 8 MatrixTimesScalar 45 34
Store 33(mat4) 46
47: 8 Load 33(mat4)
48: 7(fvec4) CompositeConstruct 34 34 34 34
49: 7(fvec4) CompositeExtract 47 0
50: 7(fvec4) FAdd 49 48
51: 7(fvec4) CompositeExtract 47 1
52: 7(fvec4) FAdd 51 48
53: 7(fvec4) CompositeExtract 47 2
54: 7(fvec4) FAdd 53 48
55: 7(fvec4) CompositeExtract 47 3
56: 7(fvec4) FAdd 55 48
57: 8 CompositeConstruct 50 52 54 56
Store 33(mat4) 57
58: 8 Load 33(mat4)
59: 7(fvec4) CompositeConstruct 42 42 42 42
60: 7(fvec4) CompositeExtract 58 0
61: 7(fvec4) FSub 60 59
62: 7(fvec4) CompositeExtract 58 1
63: 7(fvec4) FSub 62 59
64: 7(fvec4) CompositeExtract 58 2
65: 7(fvec4) FSub 64 59
66: 7(fvec4) CompositeExtract 58 3
67: 7(fvec4) FSub 66 59
68: 8 CompositeConstruct 61 63 65 67
Store 33(mat4) 68
70: 8 Load 33(mat4)
72: 6(float) FDiv 71 69
73: 8 MatrixTimesScalar 70 72
Store 33(mat4) 73
Store 77(param) 76
78: 2 FunctionCall 12(Fn1(mf44;) 77(param)
84: 83(ptr) AccessChain 17(mat1) 82
85: 7(fvec4) Load 84
86: 7(fvec4) FAdd 80 85
88: 83(ptr) AccessChain 33(mat4) 87
89: 7(fvec4) Load 88
90: 7(fvec4) FAdd 86 89
ReturnValue 90
FunctionEnd

67
Test/baseResults/hlsl.type.half.frag.out
View File

@ -49,11 +49,11 @@ gl_FragCoord origin is upper left
0:16 'h23' ( temp 2X3 matrix of float) 0:16 'h23' ( temp 2X3 matrix of float)
0:16 Constant: 0:16 Constant:
0:16 4.900000 0:16 4.900000
0:16 0.000000
0:16 0.000000
0:16 0.000000
0:16 4.900000 0:16 4.900000
0:16 0.000000 0:16 4.900000
0:16 4.900000
0:16 4.900000
0:16 4.900000
0:27 Branch: Return with expression 0:27 Branch: Return with expression
0:27 Construct vec4 ( temp 4-component vector of float) 0:27 Construct vec4 ( temp 4-component vector of float)
0:27 add ( temp float) 0:27 add ( temp float)
@ -133,11 +133,11 @@ gl_FragCoord origin is upper left
0:16 'h23' ( temp 2X3 matrix of float) 0:16 'h23' ( temp 2X3 matrix of float)
0:16 Constant: 0:16 Constant:
0:16 4.900000 0:16 4.900000
0:16 0.000000
0:16 0.000000
0:16 0.000000
0:16 4.900000 0:16 4.900000
0:16 0.000000 0:16 4.900000
0:16 4.900000
0:16 4.900000
0:16 4.900000
0:27 Branch: Return with expression 0:27 Branch: Return with expression
0:27 Construct vec4 ( temp 4-component vector of float) 0:27 Construct vec4 ( temp 4-component vector of float)
0:27 add ( temp float) 0:27 add ( temp float)
@ -165,12 +165,12 @@ gl_FragCoord origin is upper left
// Module Version 10000 // Module Version 10000
// Generated by (magic number): 80001 // Generated by (magic number): 80001
// Id's are bound by 61 // Id's are bound by 60
Capability Shader Capability Shader
1: ExtInstImport "GLSL.std.450" 1: ExtInstImport "GLSL.std.450"
MemoryModel Logical GLSL450 MemoryModel Logical GLSL450
EntryPoint Fragment 4 "main" 59 EntryPoint Fragment 4 "main" 58
ExecutionMode 4 OriginUpperLeft ExecutionMode 4 OriginUpperLeft
Source HLSL 500 Source HLSL 500
Name 4 "main" Name 4 "main"
@ -182,8 +182,8 @@ gl_FragCoord origin is upper left
Name 27 "h4" Name 27 "h4"
Name 32 "h22" Name 32 "h22"
Name 38 "h23" Name 38 "h23"
Name 59 "@entryPointOutput" Name 58 "@entryPointOutput"
Decorate 59(@entryPointOutput) Location 0 Decorate 58(@entryPointOutput) Location 0
2: TypeVoid 2: TypeVoid
3: TypeFunction 2 3: TypeFunction 2
6: TypeFloat 32 6: TypeFloat 32
@ -211,20 +211,19 @@ gl_FragCoord origin is upper left
36: TypeMatrix 21(fvec3) 2 36: TypeMatrix 21(fvec3) 2
37: TypePointer Function 36 37: TypePointer Function 36
39: 6(float) Constant 1084017869 39: 6(float) Constant 1084017869
40: 21(fvec3) ConstantComposite 39 13 13 40: 21(fvec3) ConstantComposite 39 39 39
41: 21(fvec3) ConstantComposite 13 39 13 41: 36 ConstantComposite 40 40
42: 36 ConstantComposite 40 41 42: TypeInt 32 1
43: TypeInt 32 1 43: 42(int) Constant 0
44: 43(int) Constant 0 44: TypeInt 32 0
45: TypeInt 32 0 45: 44(int) Constant 0
46: 45(int) Constant 0 48: 44(int) Constant 1
49: 45(int) Constant 1 57: TypePointer Output 7(fvec4)
58: TypePointer Output 7(fvec4) 58(@entryPointOutput): 57(ptr) Variable Output
59(@entryPointOutput): 58(ptr) Variable Output
4(main): 2 Function None 3 4(main): 2 Function None 3
5: Label 5: Label
60: 7(fvec4) FunctionCall 9(@main() 59: 7(fvec4) FunctionCall 9(@main()
Store 59(@entryPointOutput) 60 Store 58(@entryPointOutput) 59
Return Return
FunctionEnd FunctionEnd
9(@main(): 7(fvec4) Function None 8 9(@main(): 7(fvec4) Function None 8
@ -242,14 +241,14 @@ gl_FragCoord origin is upper left
Store 23(h3) 25 Store 23(h3) 25
Store 27(h4) 29 Store 27(h4) 29
Store 32(h22) 35 Store 32(h22) 35
Store 38(h23) 42 Store 38(h23) 41
47: 11(ptr) AccessChain 38(h23) 44 46 46: 11(ptr) AccessChain 38(h23) 43 45
48: 6(float) Load 47 47: 6(float) Load 46
50: 11(ptr) AccessChain 27(h4) 49 49: 11(ptr) AccessChain 27(h4) 48
51: 6(float) Load 50 50: 6(float) Load 49
52: 6(float) FAdd 48 51 51: 6(float) FAdd 47 50
53: 6(float) Load 12(h0) 52: 6(float) Load 12(h0)
54: 6(float) FAdd 52 53 53: 6(float) FAdd 51 52
55: 7(fvec4) CompositeConstruct 54 54 54 54 54: 7(fvec4) CompositeConstruct 53 53 53 53
ReturnValue 55 ReturnValue 54
FunctionEnd FunctionEnd

28
Test/hlsl.scalar2matrix.frag Normal file
View File

@ -0,0 +1,28 @@
void Fn1(float4x4 p) { }
float4 main() : SV_TARGET
{
const float4x4 mat1c = 0.20;
const float4x4 mat2c = {2, 2.1, 2.2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
const float4x4 mat3c = (float4x4)float1(0.1);
float4x4 mat1 = 0.25;
float4x4 mat2 = {3, 3.1, 3.2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
float4x4 mat3 = (float4x4)0.375;
// float4x4 mat5 = (float4x4)Fn2(); // TODO: enable when compex rvalue handling is in place
float4x4 mat4;
mat4 = 0.75;
mat4 = float4x4(4, 4.1, 4.2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0);
mat4 = (float4x4)0.5;
mat4 *= 0.75;
mat4 += 0.75;
mat4 -= 0.5;
mat4 /= 2.0;
Fn1(5.0); // test calling fn accepting matrix with scalar type
return mat1c[0] + mat3c[0] + mat1[1] + mat4[2];
}

26
glslang/MachineIndependent/Intermediate.cpp
View File

@ -1043,6 +1043,32 @@ TIntermTyped* TIntermediate::addShapeConversion(const TType& type, TIntermTyped*
// The new node that handles the conversion // The new node that handles the conversion
TOperator constructorOp = mapTypeToConstructorOp(type); TOperator constructorOp = mapTypeToConstructorOp(type);
// HLSL has custom semantics for scalar->mat shape conversions.
if (source == EShSourceHlsl) {
if (node->getType().isScalarOrVec1() && type.isMatrix()) {
// HLSL semantics: the scalar (or vec1) is replicated to every component of the matrix. Left to its
// own devices, the constructor from a scalar would populate the diagonal. This forces replication
// to every matrix element.
// Note that if the node is complex (e.g, a function call), we don't want to duplicate it here
// repeatedly, so we copy it to a temp, then use the temp.
const int matSize = type.getMatrixRows() * type.getMatrixCols();
TIntermAggregate* rhsAggregate = new TIntermAggregate();
const bool isSimple = (node->getAsSymbolNode() != nullptr) || (node->getAsConstantUnion() != nullptr);
if (!isSimple) {
assert(0); // TODO: use node replicator service when available.
}
for (int x=0; x<matSize; ++x)
rhsAggregate->getSequence().push_back(node);
return setAggregateOperator(rhsAggregate, constructorOp, type, node->getLoc());
}
}
// scalar -> vector or vec1 -> vector or // scalar -> vector or vec1 -> vector or
// vector -> scalar or // vector -> scalar or
// bigger vector -> smaller vector // bigger vector -> smaller vector

1
gtests/Hlsl.FromFile.cpp
View File

@ -285,6 +285,7 @@ INSTANTIATE_TEST_CASE_P(
{"hlsl.max.frag", "PixelShaderFunction"}, {"hlsl.max.frag", "PixelShaderFunction"},
{"hlsl.precedence.frag", "PixelShaderFunction"}, {"hlsl.precedence.frag", "PixelShaderFunction"},
{"hlsl.precedence2.frag", "PixelShaderFunction"}, {"hlsl.precedence2.frag", "PixelShaderFunction"},
{"hlsl.scalar2matrix.frag", "main"},
{"hlsl.semantic.geom", "main"}, {"hlsl.semantic.geom", "main"},
{"hlsl.semantic.vert", "main"}, {"hlsl.semantic.vert", "main"},
{"hlsl.scope.frag", "PixelShaderFunction"}, {"hlsl.scope.frag", "PixelShaderFunction"},

10
hlsl/hlslParseHelper.cpp
View File

@ -6616,6 +6616,7 @@ const TFunction* HlslParseContext::findFunction(const TSourceLoc& loc, TFunction
// shapes have to be convertible // shapes have to be convertible
if ((from.isScalarOrVec1() && to.isScalarOrVec1()) || if ((from.isScalarOrVec1() && to.isScalarOrVec1()) ||
(from.isScalarOrVec1() && to.isVector()) || (from.isScalarOrVec1() && to.isVector()) ||
(from.isScalarOrVec1() && to.isMatrix()) ||
(from.isVector() && to.isVector() && from.getVectorSize() >= to.getVectorSize())) (from.isVector() && to.isVector() && from.getVectorSize() >= to.getVectorSize()))
return true; return true;
@ -7393,8 +7394,15 @@ TIntermTyped* HlslParseContext::addConstructor(const TSourceLoc& loc, TIntermTyp
newNode = constructAggregate(node, elementType, 1, node->getLoc()); newNode = constructAggregate(node, elementType, 1, node->getLoc());
else if (op == EOpConstructStruct) else if (op == EOpConstructStruct)
newNode = constructAggregate(node, *(*memberTypes).type, 1, node->getLoc()); newNode = constructAggregate(node, *(*memberTypes).type, 1, node->getLoc());
else else {
// shape conversion for matrix constructor from scalar. HLSL semantics are: scalar
// is replicated into every element of the matrix (not just the diagnonal), so
// that is handled specially here.
if (type.isMatrix() && node->getType().isScalarOrVec1())
node = intermediate.addShapeConversion(type, node);
newNode = constructBuiltIn(type, op, node, node->getLoc(), false); newNode = constructBuiltIn(type, op, node, node->getLoc(), false);
}
if (newNode && (type.isArray() || op == EOpConstructStruct)) if (newNode && (type.isArray() || op == EOpConstructStruct))
newNode = intermediate.setAggregateOperator(newNode, EOpConstructStruct, type, loc); newNode = intermediate.setAggregateOperator(newNode, EOpConstructStruct, type, loc);