HLSL: Add shape conversions for scalar -> vector assigments.
Also, this allows turning on the error check for a failed assigment when parsing. This makes 39 HLSL tests have a working assignment that was previously silently dropped, due to lack of this functionality.
This commit is contained in:
John Kessenich
@@ -44,6 +44,16 @@ gl_FragCoord origin is upper left
|
||||
0:? Constant:
|
||||
0:? 1 (const int)
|
||||
0:? -1 (const int)
|
||||
0:40 move second child to first child (temp 4-component vector of float)
|
||||
0:40 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:40 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:40 Constant:
|
||||
0:40 0 (const int)
|
||||
0:40 Constant:
|
||||
0:40 1.000000
|
||||
0:40 1.000000
|
||||
0:40 1.000000
|
||||
0:40 1.000000
|
||||
0:41 move second child to first child (temp float)
|
||||
0:41 Depth: direct index for structure (temp float FragDepth)
|
||||
0:41 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -118,6 +128,16 @@ gl_FragCoord origin is upper left
|
||||
0:? Constant:
|
||||
0:? 1 (const int)
|
||||
0:? -1 (const int)
|
||||
0:40 move second child to first child (temp 4-component vector of float)
|
||||
0:40 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:40 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:40 Constant:
|
||||
0:40 0 (const int)
|
||||
0:40 Constant:
|
||||
0:40 1.000000
|
||||
0:40 1.000000
|
||||
0:40 1.000000
|
||||
0:40 1.000000
|
||||
0:41 move second child to first child (temp float)
|
||||
0:41 Depth: direct index for structure (temp float FragDepth)
|
||||
0:41 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -145,7 +165,7 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 98
|
||||
// Id's are bound by 100
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
@@ -166,31 +186,31 @@ gl_FragCoord origin is upper left
|
||||
MemberName 62(PS_OUTPUT) 0 "Color"
|
||||
MemberName 62(PS_OUTPUT) 1 "Depth"
|
||||
Name 64 "psout"
|
||||
Name 72 "g_tTex1df4a"
|
||||
Name 73 "g_tTex1df4"
|
||||
Name 76 "g_tTex1di4"
|
||||
Name 79 "g_tTex1du4"
|
||||
Name 82 "g_tTex3df4"
|
||||
Name 85 "g_tTex3di4"
|
||||
Name 88 "g_tTex3du4"
|
||||
Name 91 "g_tTexcdf4"
|
||||
Name 94 "g_tTexcdi4"
|
||||
Name 97 "g_tTexcdu4"
|
||||
Name 74 "g_tTex1df4a"
|
||||
Name 75 "g_tTex1df4"
|
||||
Name 78 "g_tTex1di4"
|
||||
Name 81 "g_tTex1du4"
|
||||
Name 84 "g_tTex3df4"
|
||||
Name 87 "g_tTex3di4"
|
||||
Name 90 "g_tTex3du4"
|
||||
Name 93 "g_tTexcdf4"
|
||||
Name 96 "g_tTexcdi4"
|
||||
Name 99 "g_tTexcdu4"
|
||||
Decorate 12(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 16(g_sSamp) DescriptorSet 0
|
||||
Decorate 35(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 51(g_tTex2du4) DescriptorSet 0
|
||||
MemberDecorate 62(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 72(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 73(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 76(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 79(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 82(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 85(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 88(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 91(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 94(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 97(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 74(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 75(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 78(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 81(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 84(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 87(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 90(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 93(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 96(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 99(g_tTexcdu4) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -237,35 +257,36 @@ gl_FragCoord origin is upper left
|
||||
62(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
|
||||
63: TypePointer Function 62(PS_OUTPUT)
|
||||
65: 6(float) Constant 1065353216
|
||||
66: TypePointer Function 6(float)
|
||||
70: TypeImage 6(float) 1D sampled format:Unknown
|
||||
71: TypePointer UniformConstant 70
|
||||
72(g_tTex1df4a): 71(ptr) Variable UniformConstant
|
||||
73(g_tTex1df4): 71(ptr) Variable UniformConstant
|
||||
74: TypeImage 24(int) 1D sampled format:Unknown
|
||||
75: TypePointer UniformConstant 74
|
||||
76(g_tTex1di4): 75(ptr) Variable UniformConstant
|
||||
77: TypeImage 45(int) 1D sampled format:Unknown
|
||||
78: TypePointer UniformConstant 77
|
||||
79(g_tTex1du4): 78(ptr) Variable UniformConstant
|
||||
80: TypeImage 6(float) 3D sampled format:Unknown
|
||||
81: TypePointer UniformConstant 80
|
||||
82(g_tTex3df4): 81(ptr) Variable UniformConstant
|
||||
83: TypeImage 24(int) 3D sampled format:Unknown
|
||||
84: TypePointer UniformConstant 83
|
||||
85(g_tTex3di4): 84(ptr) Variable UniformConstant
|
||||
86: TypeImage 45(int) 3D sampled format:Unknown
|
||||
87: TypePointer UniformConstant 86
|
||||
88(g_tTex3du4): 87(ptr) Variable UniformConstant
|
||||
89: TypeImage 6(float) Cube sampled format:Unknown
|
||||
90: TypePointer UniformConstant 89
|
||||
91(g_tTexcdf4): 90(ptr) Variable UniformConstant
|
||||
92: TypeImage 24(int) Cube sampled format:Unknown
|
||||
93: TypePointer UniformConstant 92
|
||||
94(g_tTexcdi4): 93(ptr) Variable UniformConstant
|
||||
95: TypeImage 45(int) Cube sampled format:Unknown
|
||||
96: TypePointer UniformConstant 95
|
||||
97(g_tTexcdu4): 96(ptr) Variable UniformConstant
|
||||
66: 7(fvec4) ConstantComposite 65 65 65 65
|
||||
68: TypePointer Function 6(float)
|
||||
72: TypeImage 6(float) 1D sampled format:Unknown
|
||||
73: TypePointer UniformConstant 72
|
||||
74(g_tTex1df4a): 73(ptr) Variable UniformConstant
|
||||
75(g_tTex1df4): 73(ptr) Variable UniformConstant
|
||||
76: TypeImage 24(int) 1D sampled format:Unknown
|
||||
77: TypePointer UniformConstant 76
|
||||
78(g_tTex1di4): 77(ptr) Variable UniformConstant
|
||||
79: TypeImage 45(int) 1D sampled format:Unknown
|
||||
80: TypePointer UniformConstant 79
|
||||
81(g_tTex1du4): 80(ptr) Variable UniformConstant
|
||||
82: TypeImage 6(float) 3D sampled format:Unknown
|
||||
83: TypePointer UniformConstant 82
|
||||
84(g_tTex3df4): 83(ptr) Variable UniformConstant
|
||||
85: TypeImage 24(int) 3D sampled format:Unknown
|
||||
86: TypePointer UniformConstant 85
|
||||
87(g_tTex3di4): 86(ptr) Variable UniformConstant
|
||||
88: TypeImage 45(int) 3D sampled format:Unknown
|
||||
89: TypePointer UniformConstant 88
|
||||
90(g_tTex3du4): 89(ptr) Variable UniformConstant
|
||||
91: TypeImage 6(float) Cube sampled format:Unknown
|
||||
92: TypePointer UniformConstant 91
|
||||
93(g_tTexcdf4): 92(ptr) Variable UniformConstant
|
||||
94: TypeImage 24(int) Cube sampled format:Unknown
|
||||
95: TypePointer UniformConstant 94
|
||||
96(g_tTexcdi4): 95(ptr) Variable UniformConstant
|
||||
97: TypeImage 45(int) Cube sampled format:Unknown
|
||||
98: TypePointer UniformConstant 97
|
||||
99(g_tTexcdu4): 98(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
9(txval20): 8(ptr) Variable Function
|
||||
@@ -287,8 +308,10 @@ gl_FragCoord origin is upper left
|
||||
55: 54 SampledImage 52 53
|
||||
61: 46(ivec4) ImageGather 55 58 27 ConstOffset 60
|
||||
Store 48(txval22) 61
|
||||
67: 66(ptr) AccessChain 64(psout) 26
|
||||
Store 67 65
|
||||
68:62(PS_OUTPUT) Load 64(psout)
|
||||
ReturnValue 68
|
||||
67: 8(ptr) AccessChain 64(psout) 27
|
||||
Store 67 66
|
||||
69: 68(ptr) AccessChain 64(psout) 26
|
||||
Store 69 65
|
||||
70:62(PS_OUTPUT) Load 64(psout)
|
||||
ReturnValue 70
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user