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
@@ -122,6 +122,16 @@ gl_FragCoord origin is upper left
|
||||
0:? 0.300000
|
||||
0:55 Constant:
|
||||
0:55 0.750000
|
||||
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})
|
||||
@@ -282,6 +292,16 @@ gl_FragCoord origin is upper left
|
||||
0:? 0.300000
|
||||
0:55 Constant:
|
||||
0:55 0.750000
|
||||
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})
|
||||
@@ -317,7 +337,7 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 171
|
||||
// Id's are bound by 175
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
@@ -351,18 +371,18 @@ gl_FragCoord origin is upper left
|
||||
MemberName 127(PS_OUTPUT) 0 "Color"
|
||||
MemberName 127(PS_OUTPUT) 1 "Depth"
|
||||
Name 129 "psout"
|
||||
Name 137 "g_tTex3df4"
|
||||
Name 140 "g_tTex3di4"
|
||||
Name 143 "g_tTex3du4"
|
||||
Name 146 "g_tTex1df4a"
|
||||
Name 149 "g_tTex1di4a"
|
||||
Name 152 "g_tTex1du4a"
|
||||
Name 155 "g_tTex2df4a"
|
||||
Name 158 "g_tTex2di4a"
|
||||
Name 161 "g_tTex2du4a"
|
||||
Name 164 "g_tTexcdf4a"
|
||||
Name 167 "g_tTexcdi4a"
|
||||
Name 170 "g_tTexcdu4a"
|
||||
Name 141 "g_tTex3df4"
|
||||
Name 144 "g_tTex3di4"
|
||||
Name 147 "g_tTex3du4"
|
||||
Name 150 "g_tTex1df4a"
|
||||
Name 153 "g_tTex1di4a"
|
||||
Name 156 "g_tTex1du4a"
|
||||
Name 159 "g_tTex2df4a"
|
||||
Name 162 "g_tTex2di4a"
|
||||
Name 165 "g_tTex2du4a"
|
||||
Name 168 "g_tTexcdf4a"
|
||||
Name 171 "g_tTexcdi4a"
|
||||
Name 174 "g_tTexcdu4a"
|
||||
Decorate 11(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 15(g_sSamp) DescriptorSet 0
|
||||
Decorate 28(g_tTex1di4) DescriptorSet 0
|
||||
@@ -374,18 +394,18 @@ gl_FragCoord origin is upper left
|
||||
Decorate 105(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 117(g_tTexcdu4) DescriptorSet 0
|
||||
MemberDecorate 127(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 137(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 140(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 143(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 146(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 149(g_tTex1di4a) DescriptorSet 0
|
||||
Decorate 152(g_tTex1du4a) DescriptorSet 0
|
||||
Decorate 155(g_tTex2df4a) DescriptorSet 0
|
||||
Decorate 158(g_tTex2di4a) DescriptorSet 0
|
||||
Decorate 161(g_tTex2du4a) DescriptorSet 0
|
||||
Decorate 164(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 167(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 170(g_tTexcdu4a) DescriptorSet 0
|
||||
Decorate 141(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 144(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 147(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 150(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 153(g_tTex1di4a) DescriptorSet 0
|
||||
Decorate 156(g_tTex1du4a) DescriptorSet 0
|
||||
Decorate 159(g_tTex2df4a) DescriptorSet 0
|
||||
Decorate 162(g_tTex2di4a) DescriptorSet 0
|
||||
Decorate 165(g_tTex2du4a) DescriptorSet 0
|
||||
Decorate 168(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 171(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 174(g_tTexcdu4a) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -451,44 +471,47 @@ gl_FragCoord origin is upper left
|
||||
126: TypeVector 6(float) 4
|
||||
127(PS_OUTPUT): TypeStruct 126(fvec4) 6(float)
|
||||
128: TypePointer Function 127(PS_OUTPUT)
|
||||
130: 25(int) Constant 1
|
||||
130: 25(int) Constant 0
|
||||
131: 6(float) Constant 1065353216
|
||||
135: TypeImage 6(float) 3D sampled format:Unknown
|
||||
136: TypePointer UniformConstant 135
|
||||
137(g_tTex3df4): 136(ptr) Variable UniformConstant
|
||||
138: TypeImage 25(int) 3D sampled format:Unknown
|
||||
139: TypePointer UniformConstant 138
|
||||
140(g_tTex3di4): 139(ptr) Variable UniformConstant
|
||||
141: TypeImage 37(int) 3D sampled format:Unknown
|
||||
142: TypePointer UniformConstant 141
|
||||
143(g_tTex3du4): 142(ptr) Variable UniformConstant
|
||||
144: TypeImage 6(float) 1D array sampled format:Unknown
|
||||
145: TypePointer UniformConstant 144
|
||||
146(g_tTex1df4a): 145(ptr) Variable UniformConstant
|
||||
147: TypeImage 25(int) 1D array sampled format:Unknown
|
||||
148: TypePointer UniformConstant 147
|
||||
149(g_tTex1di4a): 148(ptr) Variable UniformConstant
|
||||
150: TypeImage 37(int) 1D array sampled format:Unknown
|
||||
151: TypePointer UniformConstant 150
|
||||
152(g_tTex1du4a): 151(ptr) Variable UniformConstant
|
||||
153: TypeImage 6(float) 2D array sampled format:Unknown
|
||||
154: TypePointer UniformConstant 153
|
||||
155(g_tTex2df4a): 154(ptr) Variable UniformConstant
|
||||
156: TypeImage 25(int) 2D array sampled format:Unknown
|
||||
157: TypePointer UniformConstant 156
|
||||
158(g_tTex2di4a): 157(ptr) Variable UniformConstant
|
||||
159: TypeImage 37(int) 2D array sampled format:Unknown
|
||||
160: TypePointer UniformConstant 159
|
||||
161(g_tTex2du4a): 160(ptr) Variable UniformConstant
|
||||
162: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
163: TypePointer UniformConstant 162
|
||||
164(g_tTexcdf4a): 163(ptr) Variable UniformConstant
|
||||
165: TypeImage 25(int) Cube array sampled format:Unknown
|
||||
166: TypePointer UniformConstant 165
|
||||
167(g_tTexcdi4a): 166(ptr) Variable UniformConstant
|
||||
168: TypeImage 37(int) Cube array sampled format:Unknown
|
||||
169: TypePointer UniformConstant 168
|
||||
170(g_tTexcdu4a): 169(ptr) Variable UniformConstant
|
||||
132: 126(fvec4) ConstantComposite 131 131 131 131
|
||||
133: TypePointer Function 126(fvec4)
|
||||
135: 25(int) Constant 1
|
||||
139: TypeImage 6(float) 3D sampled format:Unknown
|
||||
140: TypePointer UniformConstant 139
|
||||
141(g_tTex3df4): 140(ptr) Variable UniformConstant
|
||||
142: TypeImage 25(int) 3D sampled format:Unknown
|
||||
143: TypePointer UniformConstant 142
|
||||
144(g_tTex3di4): 143(ptr) Variable UniformConstant
|
||||
145: TypeImage 37(int) 3D sampled format:Unknown
|
||||
146: TypePointer UniformConstant 145
|
||||
147(g_tTex3du4): 146(ptr) Variable UniformConstant
|
||||
148: TypeImage 6(float) 1D array sampled format:Unknown
|
||||
149: TypePointer UniformConstant 148
|
||||
150(g_tTex1df4a): 149(ptr) Variable UniformConstant
|
||||
151: TypeImage 25(int) 1D array sampled format:Unknown
|
||||
152: TypePointer UniformConstant 151
|
||||
153(g_tTex1di4a): 152(ptr) Variable UniformConstant
|
||||
154: TypeImage 37(int) 1D array sampled format:Unknown
|
||||
155: TypePointer UniformConstant 154
|
||||
156(g_tTex1du4a): 155(ptr) Variable UniformConstant
|
||||
157: TypeImage 6(float) 2D array sampled format:Unknown
|
||||
158: TypePointer UniformConstant 157
|
||||
159(g_tTex2df4a): 158(ptr) Variable UniformConstant
|
||||
160: TypeImage 25(int) 2D array sampled format:Unknown
|
||||
161: TypePointer UniformConstant 160
|
||||
162(g_tTex2di4a): 161(ptr) Variable UniformConstant
|
||||
163: TypeImage 37(int) 2D array sampled format:Unknown
|
||||
164: TypePointer UniformConstant 163
|
||||
165(g_tTex2du4a): 164(ptr) Variable UniformConstant
|
||||
166: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
167: TypePointer UniformConstant 166
|
||||
168(g_tTexcdf4a): 167(ptr) Variable UniformConstant
|
||||
169: TypeImage 25(int) Cube array sampled format:Unknown
|
||||
170: TypePointer UniformConstant 169
|
||||
171(g_tTexcdi4a): 170(ptr) Variable UniformConstant
|
||||
172: TypeImage 37(int) Cube array sampled format:Unknown
|
||||
173: TypePointer UniformConstant 172
|
||||
174(g_tTexcdu4a): 173(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
8(r00): 7(ptr) Variable Function
|
||||
@@ -561,8 +584,10 @@ gl_FragCoord origin is upper left
|
||||
124: 6(float) CompositeExtract 123 0
|
||||
125: 6(float) ImageSampleDrefImplicitLod 122 123 124
|
||||
Store 114(r54) 125
|
||||
132: 7(ptr) AccessChain 129(psout) 130
|
||||
Store 132 131
|
||||
133:127(PS_OUTPUT) Load 129(psout)
|
||||
ReturnValue 133
|
||||
134: 133(ptr) AccessChain 129(psout) 130
|
||||
Store 134 132
|
||||
136: 7(ptr) AccessChain 129(psout) 135
|
||||
Store 136 131
|
||||
137:127(PS_OUTPUT) Load 129(psout)
|
||||
ReturnValue 137
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user