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
@@ -131,6 +131,16 @@ gl_FragCoord origin is upper left
|
||||
0:? 0.400000
|
||||
0:54 Constant:
|
||||
0:54 0.750000
|
||||
0:56 move second child to first child (temp 4-component vector of float)
|
||||
0:56 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:56 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:56 Constant:
|
||||
0:56 0 (const int)
|
||||
0:56 Constant:
|
||||
0:56 1.000000
|
||||
0:56 1.000000
|
||||
0:56 1.000000
|
||||
0:56 1.000000
|
||||
0:57 move second child to first child (temp float)
|
||||
0:57 Depth: direct index for structure (temp float FragDepth)
|
||||
0:57 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -300,6 +310,16 @@ gl_FragCoord origin is upper left
|
||||
0:? 0.400000
|
||||
0:54 Constant:
|
||||
0:54 0.750000
|
||||
0:56 move second child to first child (temp 4-component vector of float)
|
||||
0:56 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:56 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:56 Constant:
|
||||
0:56 0 (const int)
|
||||
0:56 Constant:
|
||||
0:56 1.000000
|
||||
0:56 1.000000
|
||||
0:56 1.000000
|
||||
0:56 1.000000
|
||||
0:57 move second child to first child (temp float)
|
||||
0:57 Depth: direct index for structure (temp float FragDepth)
|
||||
0:57 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -335,7 +355,7 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 173
|
||||
// Id's are bound by 177
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
@@ -369,18 +389,18 @@ gl_FragCoord origin is upper left
|
||||
MemberName 129(PS_OUTPUT) 0 "Color"
|
||||
MemberName 129(PS_OUTPUT) 1 "Depth"
|
||||
Name 131 "psout"
|
||||
Name 139 "g_tTex1df4"
|
||||
Name 142 "g_tTex1di4"
|
||||
Name 145 "g_tTex1du4"
|
||||
Name 148 "g_tTex2df4"
|
||||
Name 151 "g_tTex2di4"
|
||||
Name 154 "g_tTex2du4"
|
||||
Name 157 "g_tTex3df4"
|
||||
Name 160 "g_tTex3di4"
|
||||
Name 163 "g_tTex3du4"
|
||||
Name 166 "g_tTexcdf4"
|
||||
Name 169 "g_tTexcdi4"
|
||||
Name 172 "g_tTexcdu4"
|
||||
Name 143 "g_tTex1df4"
|
||||
Name 146 "g_tTex1di4"
|
||||
Name 149 "g_tTex1du4"
|
||||
Name 152 "g_tTex2df4"
|
||||
Name 155 "g_tTex2di4"
|
||||
Name 158 "g_tTex2du4"
|
||||
Name 161 "g_tTex3df4"
|
||||
Name 164 "g_tTex3di4"
|
||||
Name 167 "g_tTex3du4"
|
||||
Name 170 "g_tTexcdf4"
|
||||
Name 173 "g_tTexcdi4"
|
||||
Name 176 "g_tTexcdu4"
|
||||
Decorate 11(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 15(g_sSamp) DescriptorSet 0
|
||||
Decorate 32(g_tTex1di4a) DescriptorSet 0
|
||||
@@ -392,18 +412,18 @@ gl_FragCoord origin is upper left
|
||||
Decorate 110(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 121(g_tTexcdu4a) DescriptorSet 0
|
||||
MemberDecorate 129(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 139(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 142(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 145(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 148(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 151(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 154(g_tTex2du4) DescriptorSet 0
|
||||
Decorate 157(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 160(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 163(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 166(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 169(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 172(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 143(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 146(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 149(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 152(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 155(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 158(g_tTex2du4) DescriptorSet 0
|
||||
Decorate 161(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 164(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 167(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 170(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 173(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 176(g_tTexcdu4) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -471,44 +491,47 @@ gl_FragCoord origin is upper left
|
||||
125: TypeSampledImage 124
|
||||
129(PS_OUTPUT): TypeStruct 102(fvec4) 6(float)
|
||||
130: TypePointer Function 129(PS_OUTPUT)
|
||||
132: 29(int) Constant 1
|
||||
132: 29(int) Constant 0
|
||||
133: 6(float) Constant 1065353216
|
||||
137: TypeImage 6(float) 1D sampled format:Unknown
|
||||
138: TypePointer UniformConstant 137
|
||||
139(g_tTex1df4): 138(ptr) Variable UniformConstant
|
||||
140: TypeImage 29(int) 1D sampled format:Unknown
|
||||
141: TypePointer UniformConstant 140
|
||||
142(g_tTex1di4): 141(ptr) Variable UniformConstant
|
||||
143: TypeImage 42(int) 1D sampled format:Unknown
|
||||
144: TypePointer UniformConstant 143
|
||||
145(g_tTex1du4): 144(ptr) Variable UniformConstant
|
||||
146: TypeImage 6(float) 2D sampled format:Unknown
|
||||
147: TypePointer UniformConstant 146
|
||||
148(g_tTex2df4): 147(ptr) Variable UniformConstant
|
||||
149: TypeImage 29(int) 2D sampled format:Unknown
|
||||
150: TypePointer UniformConstant 149
|
||||
151(g_tTex2di4): 150(ptr) Variable UniformConstant
|
||||
152: TypeImage 42(int) 2D sampled format:Unknown
|
||||
153: TypePointer UniformConstant 152
|
||||
154(g_tTex2du4): 153(ptr) Variable UniformConstant
|
||||
155: TypeImage 6(float) 3D sampled format:Unknown
|
||||
156: TypePointer UniformConstant 155
|
||||
157(g_tTex3df4): 156(ptr) Variable UniformConstant
|
||||
158: TypeImage 29(int) 3D sampled format:Unknown
|
||||
159: TypePointer UniformConstant 158
|
||||
160(g_tTex3di4): 159(ptr) Variable UniformConstant
|
||||
161: TypeImage 42(int) 3D sampled format:Unknown
|
||||
162: TypePointer UniformConstant 161
|
||||
163(g_tTex3du4): 162(ptr) Variable UniformConstant
|
||||
164: TypeImage 6(float) Cube sampled format:Unknown
|
||||
165: TypePointer UniformConstant 164
|
||||
166(g_tTexcdf4): 165(ptr) Variable UniformConstant
|
||||
167: TypeImage 29(int) Cube sampled format:Unknown
|
||||
168: TypePointer UniformConstant 167
|
||||
169(g_tTexcdi4): 168(ptr) Variable UniformConstant
|
||||
170: TypeImage 42(int) Cube sampled format:Unknown
|
||||
171: TypePointer UniformConstant 170
|
||||
172(g_tTexcdu4): 171(ptr) Variable UniformConstant
|
||||
134: 102(fvec4) ConstantComposite 133 133 133 133
|
||||
135: TypePointer Function 102(fvec4)
|
||||
137: 29(int) Constant 1
|
||||
141: TypeImage 6(float) 1D sampled format:Unknown
|
||||
142: TypePointer UniformConstant 141
|
||||
143(g_tTex1df4): 142(ptr) Variable UniformConstant
|
||||
144: TypeImage 29(int) 1D sampled format:Unknown
|
||||
145: TypePointer UniformConstant 144
|
||||
146(g_tTex1di4): 145(ptr) Variable UniformConstant
|
||||
147: TypeImage 42(int) 1D sampled format:Unknown
|
||||
148: TypePointer UniformConstant 147
|
||||
149(g_tTex1du4): 148(ptr) Variable UniformConstant
|
||||
150: TypeImage 6(float) 2D sampled format:Unknown
|
||||
151: TypePointer UniformConstant 150
|
||||
152(g_tTex2df4): 151(ptr) Variable UniformConstant
|
||||
153: TypeImage 29(int) 2D sampled format:Unknown
|
||||
154: TypePointer UniformConstant 153
|
||||
155(g_tTex2di4): 154(ptr) Variable UniformConstant
|
||||
156: TypeImage 42(int) 2D sampled format:Unknown
|
||||
157: TypePointer UniformConstant 156
|
||||
158(g_tTex2du4): 157(ptr) Variable UniformConstant
|
||||
159: TypeImage 6(float) 3D sampled format:Unknown
|
||||
160: TypePointer UniformConstant 159
|
||||
161(g_tTex3df4): 160(ptr) Variable UniformConstant
|
||||
162: TypeImage 29(int) 3D sampled format:Unknown
|
||||
163: TypePointer UniformConstant 162
|
||||
164(g_tTex3di4): 163(ptr) Variable UniformConstant
|
||||
165: TypeImage 42(int) 3D sampled format:Unknown
|
||||
166: TypePointer UniformConstant 165
|
||||
167(g_tTex3du4): 166(ptr) Variable UniformConstant
|
||||
168: TypeImage 6(float) Cube sampled format:Unknown
|
||||
169: TypePointer UniformConstant 168
|
||||
170(g_tTexcdf4): 169(ptr) Variable UniformConstant
|
||||
171: TypeImage 29(int) Cube sampled format:Unknown
|
||||
172: TypePointer UniformConstant 171
|
||||
173(g_tTexcdi4): 172(ptr) Variable UniformConstant
|
||||
174: TypeImage 42(int) Cube sampled format:Unknown
|
||||
175: TypePointer UniformConstant 174
|
||||
176(g_tTexcdu4): 175(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
8(r10): 7(ptr) Variable Function
|
||||
@@ -581,8 +604,10 @@ gl_FragCoord origin is upper left
|
||||
127: 6(float) CompositeExtract 104 0
|
||||
128: 6(float) ImageSampleDrefImplicitLod 126 127 24
|
||||
Store 118(r64) 128
|
||||
134: 7(ptr) AccessChain 131(psout) 132
|
||||
Store 134 133
|
||||
135:129(PS_OUTPUT) Load 131(psout)
|
||||
ReturnValue 135
|
||||
136: 135(ptr) AccessChain 131(psout) 132
|
||||
Store 136 134
|
||||
138: 7(ptr) AccessChain 131(psout) 137
|
||||
Store 138 133
|
||||
139:129(PS_OUTPUT) Load 131(psout)
|
||||
ReturnValue 139
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user