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
@@ -89,6 +89,16 @@ gl_FragCoord origin is upper left
|
||||
0:59 'c4' (uniform 4-component vector of int)
|
||||
0:59 Constant:
|
||||
0:59 3 (const int)
|
||||
0:67 move second child to first child (temp 4-component vector of float)
|
||||
0:67 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:67 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:67 Constant:
|
||||
0:67 0 (const int)
|
||||
0:67 Constant:
|
||||
0:67 1.000000
|
||||
0:67 1.000000
|
||||
0:67 1.000000
|
||||
0:67 1.000000
|
||||
0:68 move second child to first child (temp float)
|
||||
0:68 Depth: direct index for structure (temp float FragDepth)
|
||||
0:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -224,6 +234,16 @@ gl_FragCoord origin is upper left
|
||||
0:59 'c4' (uniform 4-component vector of int)
|
||||
0:59 Constant:
|
||||
0:59 3 (const int)
|
||||
0:67 move second child to first child (temp 4-component vector of float)
|
||||
0:67 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:67 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:67 Constant:
|
||||
0:67 0 (const int)
|
||||
0:67 Constant:
|
||||
0:67 1.000000
|
||||
0:67 1.000000
|
||||
0:67 1.000000
|
||||
0:67 1.000000
|
||||
0:68 move second child to first child (temp float)
|
||||
0:68 Depth: direct index for structure (temp float FragDepth)
|
||||
0:68 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -267,7 +287,7 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 139
|
||||
// Id's are bound by 143
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
@@ -290,28 +310,28 @@ gl_FragCoord origin is upper left
|
||||
MemberName 75(PS_OUTPUT) 0 "Color"
|
||||
MemberName 75(PS_OUTPUT) 1 "Depth"
|
||||
Name 77 "psout"
|
||||
Name 86 "g_sSamp"
|
||||
Name 89 "g_tTex1df4"
|
||||
Name 92 "g_tTex1di4"
|
||||
Name 95 "g_tTex1du4"
|
||||
Name 98 "g_tTex2df4"
|
||||
Name 101 "g_tTex2di4"
|
||||
Name 104 "g_tTex2du4"
|
||||
Name 107 "g_tTex3df4"
|
||||
Name 110 "g_tTex3di4"
|
||||
Name 113 "g_tTex3du4"
|
||||
Name 116 "g_tTexcdf4"
|
||||
Name 119 "g_tTexcdi4"
|
||||
Name 122 "g_tTexcdu4"
|
||||
Name 125 "g_tTexcdf4a"
|
||||
Name 128 "g_tTexcdi4a"
|
||||
Name 131 "g_tTexcdu4a"
|
||||
Name 132 "c1"
|
||||
Name 134 "c2"
|
||||
Name 135 "o1"
|
||||
Name 136 "o2"
|
||||
Name 137 "o3"
|
||||
Name 138 "o4"
|
||||
Name 90 "g_sSamp"
|
||||
Name 93 "g_tTex1df4"
|
||||
Name 96 "g_tTex1di4"
|
||||
Name 99 "g_tTex1du4"
|
||||
Name 102 "g_tTex2df4"
|
||||
Name 105 "g_tTex2di4"
|
||||
Name 108 "g_tTex2du4"
|
||||
Name 111 "g_tTex3df4"
|
||||
Name 114 "g_tTex3di4"
|
||||
Name 117 "g_tTex3du4"
|
||||
Name 120 "g_tTexcdf4"
|
||||
Name 123 "g_tTexcdi4"
|
||||
Name 126 "g_tTexcdu4"
|
||||
Name 129 "g_tTexcdf4a"
|
||||
Name 132 "g_tTexcdi4a"
|
||||
Name 135 "g_tTexcdu4a"
|
||||
Name 136 "c1"
|
||||
Name 138 "c2"
|
||||
Name 139 "o1"
|
||||
Name 140 "o2"
|
||||
Name 141 "o3"
|
||||
Name 142 "o4"
|
||||
Decorate 9(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 27(g_tTex1di4a) DescriptorSet 0
|
||||
Decorate 37(g_tTex1du4a) DescriptorSet 0
|
||||
@@ -319,22 +339,22 @@ gl_FragCoord origin is upper left
|
||||
Decorate 59(g_tTex2di4a) DescriptorSet 0
|
||||
Decorate 68(g_tTex2du4a) DescriptorSet 0
|
||||
MemberDecorate 75(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 86(g_sSamp) DescriptorSet 0
|
||||
Decorate 89(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 92(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 95(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 98(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 101(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 104(g_tTex2du4) DescriptorSet 0
|
||||
Decorate 107(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 110(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 113(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 116(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 119(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 122(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 125(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 128(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 131(g_tTexcdu4a) DescriptorSet 0
|
||||
Decorate 90(g_sSamp) DescriptorSet 0
|
||||
Decorate 93(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 96(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 99(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 102(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 105(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 108(g_tTex2du4) DescriptorSet 0
|
||||
Decorate 111(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 114(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 117(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 120(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 123(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 126(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 129(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 132(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 135(g_tTexcdu4a) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -372,64 +392,67 @@ gl_FragCoord origin is upper left
|
||||
68(g_tTex2du4a): 67(ptr) Variable UniformConstant
|
||||
75(PS_OUTPUT): TypeStruct 23(fvec4) 6(float)
|
||||
76: TypePointer Function 75(PS_OUTPUT)
|
||||
78: 11(int) Constant 1
|
||||
78: 11(int) Constant 0
|
||||
79: 6(float) Constant 1065353216
|
||||
80: TypePointer Function 6(float)
|
||||
84: TypeSampler
|
||||
85: TypePointer UniformConstant 84
|
||||
86(g_sSamp): 85(ptr) Variable UniformConstant
|
||||
87: TypeImage 6(float) 1D sampled format:Unknown
|
||||
88: TypePointer UniformConstant 87
|
||||
89(g_tTex1df4): 88(ptr) Variable UniformConstant
|
||||
90: TypeImage 11(int) 1D sampled format:Unknown
|
||||
91: TypePointer UniformConstant 90
|
||||
92(g_tTex1di4): 91(ptr) Variable UniformConstant
|
||||
93: TypeImage 18(int) 1D sampled format:Unknown
|
||||
94: TypePointer UniformConstant 93
|
||||
95(g_tTex1du4): 94(ptr) Variable UniformConstant
|
||||
96: TypeImage 6(float) 2D sampled format:Unknown
|
||||
97: TypePointer UniformConstant 96
|
||||
98(g_tTex2df4): 97(ptr) Variable UniformConstant
|
||||
99: TypeImage 11(int) 2D sampled format:Unknown
|
||||
100: TypePointer UniformConstant 99
|
||||
101(g_tTex2di4): 100(ptr) Variable UniformConstant
|
||||
102: TypeImage 18(int) 2D sampled format:Unknown
|
||||
103: TypePointer UniformConstant 102
|
||||
104(g_tTex2du4): 103(ptr) Variable UniformConstant
|
||||
105: TypeImage 6(float) 3D sampled format:Unknown
|
||||
106: TypePointer UniformConstant 105
|
||||
107(g_tTex3df4): 106(ptr) Variable UniformConstant
|
||||
108: TypeImage 11(int) 3D sampled format:Unknown
|
||||
109: TypePointer UniformConstant 108
|
||||
110(g_tTex3di4): 109(ptr) Variable UniformConstant
|
||||
111: TypeImage 18(int) 3D sampled format:Unknown
|
||||
112: TypePointer UniformConstant 111
|
||||
113(g_tTex3du4): 112(ptr) Variable UniformConstant
|
||||
114: TypeImage 6(float) Cube sampled format:Unknown
|
||||
115: TypePointer UniformConstant 114
|
||||
116(g_tTexcdf4): 115(ptr) Variable UniformConstant
|
||||
117: TypeImage 11(int) Cube sampled format:Unknown
|
||||
118: TypePointer UniformConstant 117
|
||||
119(g_tTexcdi4): 118(ptr) Variable UniformConstant
|
||||
120: TypeImage 18(int) Cube sampled format:Unknown
|
||||
121: TypePointer UniformConstant 120
|
||||
122(g_tTexcdu4): 121(ptr) Variable UniformConstant
|
||||
123: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
124: TypePointer UniformConstant 123
|
||||
125(g_tTexcdf4a): 124(ptr) Variable UniformConstant
|
||||
126: TypeImage 11(int) Cube array sampled format:Unknown
|
||||
127: TypePointer UniformConstant 126
|
||||
128(g_tTexcdi4a): 127(ptr) Variable UniformConstant
|
||||
129: TypeImage 18(int) Cube array sampled format:Unknown
|
||||
130: TypePointer UniformConstant 129
|
||||
131(g_tTexcdu4a): 130(ptr) Variable UniformConstant
|
||||
132(c1): 20(ptr) Variable UniformConstant
|
||||
133: TypePointer UniformConstant 15(ivec2)
|
||||
134(c2): 133(ptr) Variable UniformConstant
|
||||
135(o1): 20(ptr) Variable UniformConstant
|
||||
136(o2): 133(ptr) Variable UniformConstant
|
||||
137(o3): 13(ptr) Variable UniformConstant
|
||||
138(o4): 49(ptr) Variable UniformConstant
|
||||
80: 23(fvec4) ConstantComposite 79 79 79 79
|
||||
81: TypePointer Function 23(fvec4)
|
||||
83: 11(int) Constant 1
|
||||
84: TypePointer Function 6(float)
|
||||
88: TypeSampler
|
||||
89: TypePointer UniformConstant 88
|
||||
90(g_sSamp): 89(ptr) Variable UniformConstant
|
||||
91: TypeImage 6(float) 1D sampled format:Unknown
|
||||
92: TypePointer UniformConstant 91
|
||||
93(g_tTex1df4): 92(ptr) Variable UniformConstant
|
||||
94: TypeImage 11(int) 1D sampled format:Unknown
|
||||
95: TypePointer UniformConstant 94
|
||||
96(g_tTex1di4): 95(ptr) Variable UniformConstant
|
||||
97: TypeImage 18(int) 1D sampled format:Unknown
|
||||
98: TypePointer UniformConstant 97
|
||||
99(g_tTex1du4): 98(ptr) Variable UniformConstant
|
||||
100: TypeImage 6(float) 2D sampled format:Unknown
|
||||
101: TypePointer UniformConstant 100
|
||||
102(g_tTex2df4): 101(ptr) Variable UniformConstant
|
||||
103: TypeImage 11(int) 2D sampled format:Unknown
|
||||
104: TypePointer UniformConstant 103
|
||||
105(g_tTex2di4): 104(ptr) Variable UniformConstant
|
||||
106: TypeImage 18(int) 2D sampled format:Unknown
|
||||
107: TypePointer UniformConstant 106
|
||||
108(g_tTex2du4): 107(ptr) Variable UniformConstant
|
||||
109: TypeImage 6(float) 3D sampled format:Unknown
|
||||
110: TypePointer UniformConstant 109
|
||||
111(g_tTex3df4): 110(ptr) Variable UniformConstant
|
||||
112: TypeImage 11(int) 3D sampled format:Unknown
|
||||
113: TypePointer UniformConstant 112
|
||||
114(g_tTex3di4): 113(ptr) Variable UniformConstant
|
||||
115: TypeImage 18(int) 3D sampled format:Unknown
|
||||
116: TypePointer UniformConstant 115
|
||||
117(g_tTex3du4): 116(ptr) Variable UniformConstant
|
||||
118: TypeImage 6(float) Cube sampled format:Unknown
|
||||
119: TypePointer UniformConstant 118
|
||||
120(g_tTexcdf4): 119(ptr) Variable UniformConstant
|
||||
121: TypeImage 11(int) Cube sampled format:Unknown
|
||||
122: TypePointer UniformConstant 121
|
||||
123(g_tTexcdi4): 122(ptr) Variable UniformConstant
|
||||
124: TypeImage 18(int) Cube sampled format:Unknown
|
||||
125: TypePointer UniformConstant 124
|
||||
126(g_tTexcdu4): 125(ptr) Variable UniformConstant
|
||||
127: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
128: TypePointer UniformConstant 127
|
||||
129(g_tTexcdf4a): 128(ptr) Variable UniformConstant
|
||||
130: TypeImage 11(int) Cube array sampled format:Unknown
|
||||
131: TypePointer UniformConstant 130
|
||||
132(g_tTexcdi4a): 131(ptr) Variable UniformConstant
|
||||
133: TypeImage 18(int) Cube array sampled format:Unknown
|
||||
134: TypePointer UniformConstant 133
|
||||
135(g_tTexcdu4a): 134(ptr) Variable UniformConstant
|
||||
136(c1): 20(ptr) Variable UniformConstant
|
||||
137: TypePointer UniformConstant 15(ivec2)
|
||||
138(c2): 137(ptr) Variable UniformConstant
|
||||
139(o1): 20(ptr) Variable UniformConstant
|
||||
140(o2): 137(ptr) Variable UniformConstant
|
||||
141(o3): 13(ptr) Variable UniformConstant
|
||||
142(o4): 49(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
77(psout): 76(ptr) Variable Function
|
||||
@@ -469,8 +492,10 @@ gl_FragCoord origin is upper left
|
||||
72: 20(ptr) AccessChain 50(c4) 53
|
||||
73: 11(int) Load 72
|
||||
74: 43(ivec4) ImageFetch 69 71 Lod 73
|
||||
81: 80(ptr) AccessChain 77(psout) 78
|
||||
Store 81 79
|
||||
82:75(PS_OUTPUT) Load 77(psout)
|
||||
ReturnValue 82
|
||||
82: 81(ptr) AccessChain 77(psout) 78
|
||||
Store 82 80
|
||||
85: 84(ptr) AccessChain 77(psout) 83
|
||||
Store 85 79
|
||||
86:75(PS_OUTPUT) Load 77(psout)
|
||||
ReturnValue 86
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user