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
@@ -140,6 +140,16 @@ gl_FragCoord origin is upper left
|
||||
0:55 0.750000
|
||||
0:55 Constant:
|
||||
0:55 0.000000
|
||||
0:57 move second child to first child (temp 4-component vector of float)
|
||||
0:57 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:57 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:57 Constant:
|
||||
0:57 0 (const int)
|
||||
0:57 Constant:
|
||||
0:57 1.000000
|
||||
0:57 1.000000
|
||||
0:57 1.000000
|
||||
0:57 1.000000
|
||||
0:58 move second child to first child (temp float)
|
||||
0:58 Depth: direct index for structure (temp float FragDepth)
|
||||
0:58 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -318,6 +328,16 @@ gl_FragCoord origin is upper left
|
||||
0:55 0.750000
|
||||
0:55 Constant:
|
||||
0:55 0.000000
|
||||
0:57 move second child to first child (temp 4-component vector of float)
|
||||
0:57 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:57 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:57 Constant:
|
||||
0:57 0 (const int)
|
||||
0:57 Constant:
|
||||
0:57 1.000000
|
||||
0:57 1.000000
|
||||
0:57 1.000000
|
||||
0:57 1.000000
|
||||
0:58 move second child to first child (temp float)
|
||||
0:58 Depth: direct index for structure (temp float FragDepth)
|
||||
0:58 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -353,7 +373,7 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 172
|
||||
// Id's are bound by 176
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
@@ -387,18 +407,18 @@ gl_FragCoord origin is upper left
|
||||
MemberName 128(PS_OUTPUT) 0 "Color"
|
||||
MemberName 128(PS_OUTPUT) 1 "Depth"
|
||||
Name 130 "psout"
|
||||
Name 138 "g_tTex3df4"
|
||||
Name 141 "g_tTex3di4"
|
||||
Name 144 "g_tTex3du4"
|
||||
Name 147 "g_tTex1df4a"
|
||||
Name 150 "g_tTex1di4a"
|
||||
Name 153 "g_tTex1du4a"
|
||||
Name 156 "g_tTex2df4a"
|
||||
Name 159 "g_tTex2di4a"
|
||||
Name 162 "g_tTex2du4a"
|
||||
Name 165 "g_tTexcdf4a"
|
||||
Name 168 "g_tTexcdi4a"
|
||||
Name 171 "g_tTexcdu4a"
|
||||
Name 142 "g_tTex3df4"
|
||||
Name 145 "g_tTex3di4"
|
||||
Name 148 "g_tTex3du4"
|
||||
Name 151 "g_tTex1df4a"
|
||||
Name 154 "g_tTex1di4a"
|
||||
Name 157 "g_tTex1du4a"
|
||||
Name 160 "g_tTex2df4a"
|
||||
Name 163 "g_tTex2di4a"
|
||||
Name 166 "g_tTex2du4a"
|
||||
Name 169 "g_tTexcdf4a"
|
||||
Name 172 "g_tTexcdi4a"
|
||||
Name 175 "g_tTexcdu4a"
|
||||
Decorate 11(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 15(g_sSamp) DescriptorSet 0
|
||||
Decorate 29(g_tTex1di4) DescriptorSet 0
|
||||
@@ -410,18 +430,18 @@ gl_FragCoord origin is upper left
|
||||
Decorate 106(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 118(g_tTexcdu4) DescriptorSet 0
|
||||
MemberDecorate 128(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 138(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 141(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 144(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 147(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 150(g_tTex1di4a) DescriptorSet 0
|
||||
Decorate 153(g_tTex1du4a) DescriptorSet 0
|
||||
Decorate 156(g_tTex2df4a) DescriptorSet 0
|
||||
Decorate 159(g_tTex2di4a) DescriptorSet 0
|
||||
Decorate 162(g_tTex2du4a) DescriptorSet 0
|
||||
Decorate 165(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 168(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 171(g_tTexcdu4a) DescriptorSet 0
|
||||
Decorate 142(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 145(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 148(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 151(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 154(g_tTex1di4a) DescriptorSet 0
|
||||
Decorate 157(g_tTex1du4a) DescriptorSet 0
|
||||
Decorate 160(g_tTex2df4a) DescriptorSet 0
|
||||
Decorate 163(g_tTex2di4a) DescriptorSet 0
|
||||
Decorate 166(g_tTex2du4a) DescriptorSet 0
|
||||
Decorate 169(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 172(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 175(g_tTexcdu4a) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -488,44 +508,47 @@ gl_FragCoord origin is upper left
|
||||
127: TypeVector 6(float) 4
|
||||
128(PS_OUTPUT): TypeStruct 127(fvec4) 6(float)
|
||||
129: TypePointer Function 128(PS_OUTPUT)
|
||||
131: 26(int) Constant 1
|
||||
131: 26(int) Constant 0
|
||||
132: 6(float) Constant 1065353216
|
||||
136: TypeImage 6(float) 3D sampled format:Unknown
|
||||
137: TypePointer UniformConstant 136
|
||||
138(g_tTex3df4): 137(ptr) Variable UniformConstant
|
||||
139: TypeImage 26(int) 3D sampled format:Unknown
|
||||
140: TypePointer UniformConstant 139
|
||||
141(g_tTex3di4): 140(ptr) Variable UniformConstant
|
||||
142: TypeImage 38(int) 3D sampled format:Unknown
|
||||
143: TypePointer UniformConstant 142
|
||||
144(g_tTex3du4): 143(ptr) Variable UniformConstant
|
||||
145: TypeImage 6(float) 1D array sampled format:Unknown
|
||||
146: TypePointer UniformConstant 145
|
||||
147(g_tTex1df4a): 146(ptr) Variable UniformConstant
|
||||
148: TypeImage 26(int) 1D array sampled format:Unknown
|
||||
149: TypePointer UniformConstant 148
|
||||
150(g_tTex1di4a): 149(ptr) Variable UniformConstant
|
||||
151: TypeImage 38(int) 1D array sampled format:Unknown
|
||||
152: TypePointer UniformConstant 151
|
||||
153(g_tTex1du4a): 152(ptr) Variable UniformConstant
|
||||
154: TypeImage 6(float) 2D array sampled format:Unknown
|
||||
155: TypePointer UniformConstant 154
|
||||
156(g_tTex2df4a): 155(ptr) Variable UniformConstant
|
||||
157: TypeImage 26(int) 2D array sampled format:Unknown
|
||||
158: TypePointer UniformConstant 157
|
||||
159(g_tTex2di4a): 158(ptr) Variable UniformConstant
|
||||
160: TypeImage 38(int) 2D array sampled format:Unknown
|
||||
161: TypePointer UniformConstant 160
|
||||
162(g_tTex2du4a): 161(ptr) Variable UniformConstant
|
||||
163: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
164: TypePointer UniformConstant 163
|
||||
165(g_tTexcdf4a): 164(ptr) Variable UniformConstant
|
||||
166: TypeImage 26(int) Cube array sampled format:Unknown
|
||||
167: TypePointer UniformConstant 166
|
||||
168(g_tTexcdi4a): 167(ptr) Variable UniformConstant
|
||||
169: TypeImage 38(int) Cube array sampled format:Unknown
|
||||
170: TypePointer UniformConstant 169
|
||||
171(g_tTexcdu4a): 170(ptr) Variable UniformConstant
|
||||
133: 127(fvec4) ConstantComposite 132 132 132 132
|
||||
134: TypePointer Function 127(fvec4)
|
||||
136: 26(int) Constant 1
|
||||
140: TypeImage 6(float) 3D sampled format:Unknown
|
||||
141: TypePointer UniformConstant 140
|
||||
142(g_tTex3df4): 141(ptr) Variable UniformConstant
|
||||
143: TypeImage 26(int) 3D sampled format:Unknown
|
||||
144: TypePointer UniformConstant 143
|
||||
145(g_tTex3di4): 144(ptr) Variable UniformConstant
|
||||
146: TypeImage 38(int) 3D sampled format:Unknown
|
||||
147: TypePointer UniformConstant 146
|
||||
148(g_tTex3du4): 147(ptr) Variable UniformConstant
|
||||
149: TypeImage 6(float) 1D array sampled format:Unknown
|
||||
150: TypePointer UniformConstant 149
|
||||
151(g_tTex1df4a): 150(ptr) Variable UniformConstant
|
||||
152: TypeImage 26(int) 1D array sampled format:Unknown
|
||||
153: TypePointer UniformConstant 152
|
||||
154(g_tTex1di4a): 153(ptr) Variable UniformConstant
|
||||
155: TypeImage 38(int) 1D array sampled format:Unknown
|
||||
156: TypePointer UniformConstant 155
|
||||
157(g_tTex1du4a): 156(ptr) Variable UniformConstant
|
||||
158: TypeImage 6(float) 2D array sampled format:Unknown
|
||||
159: TypePointer UniformConstant 158
|
||||
160(g_tTex2df4a): 159(ptr) Variable UniformConstant
|
||||
161: TypeImage 26(int) 2D array sampled format:Unknown
|
||||
162: TypePointer UniformConstant 161
|
||||
163(g_tTex2di4a): 162(ptr) Variable UniformConstant
|
||||
164: TypeImage 38(int) 2D array sampled format:Unknown
|
||||
165: TypePointer UniformConstant 164
|
||||
166(g_tTex2du4a): 165(ptr) Variable UniformConstant
|
||||
167: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
168: TypePointer UniformConstant 167
|
||||
169(g_tTexcdf4a): 168(ptr) Variable UniformConstant
|
||||
170: TypeImage 26(int) Cube array sampled format:Unknown
|
||||
171: TypePointer UniformConstant 170
|
||||
172(g_tTexcdi4a): 171(ptr) Variable UniformConstant
|
||||
173: TypeImage 38(int) Cube array sampled format:Unknown
|
||||
174: TypePointer UniformConstant 173
|
||||
175(g_tTexcdu4a): 174(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
8(r00): 7(ptr) Variable Function
|
||||
@@ -598,8 +621,10 @@ gl_FragCoord origin is upper left
|
||||
125: 6(float) CompositeExtract 124 0
|
||||
126: 6(float) ImageSampleDrefExplicitLod 123 124 125 Lod 22
|
||||
Store 115(r54) 126
|
||||
133: 7(ptr) AccessChain 130(psout) 131
|
||||
Store 133 132
|
||||
134:128(PS_OUTPUT) Load 130(psout)
|
||||
ReturnValue 134
|
||||
135: 134(ptr) AccessChain 130(psout) 131
|
||||
Store 135 133
|
||||
137: 7(ptr) AccessChain 130(psout) 136
|
||||
Store 137 132
|
||||
138:128(PS_OUTPUT) Load 130(psout)
|
||||
ReturnValue 138
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user