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
@@ -113,6 +113,16 @@ gl_FragCoord origin is upper left
|
||||
0:? Constant:
|
||||
0:? 2 (const int)
|
||||
0:? 3 (const int)
|
||||
0:63 move second child to first child (temp 4-component vector of float)
|
||||
0:63 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:63 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:63 Constant:
|
||||
0:63 0 (const int)
|
||||
0:63 Constant:
|
||||
0:63 1.000000
|
||||
0:63 1.000000
|
||||
0:63 1.000000
|
||||
0:63 1.000000
|
||||
0:64 move second child to first child (temp float)
|
||||
0:64 Depth: direct index for structure (temp float FragDepth)
|
||||
0:64 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -264,6 +274,16 @@ gl_FragCoord origin is upper left
|
||||
0:? Constant:
|
||||
0:? 2 (const int)
|
||||
0:? 3 (const int)
|
||||
0:63 move second child to first child (temp 4-component vector of float)
|
||||
0:63 Color: direct index for structure (temp 4-component vector of float)
|
||||
0:63 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
0:63 Constant:
|
||||
0:63 0 (const int)
|
||||
0:63 Constant:
|
||||
0:63 1.000000
|
||||
0:63 1.000000
|
||||
0:63 1.000000
|
||||
0:63 1.000000
|
||||
0:64 move second child to first child (temp float)
|
||||
0:64 Depth: direct index for structure (temp float FragDepth)
|
||||
0:64 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
|
||||
@@ -299,7 +319,7 @@ gl_FragCoord origin is upper left
|
||||
|
||||
// Module Version 10000
|
||||
// Generated by (magic number): 80001
|
||||
// Id's are bound by 152
|
||||
// Id's are bound by 156
|
||||
|
||||
Capability Shader
|
||||
Capability Sampled1D
|
||||
@@ -327,21 +347,21 @@ gl_FragCoord origin is upper left
|
||||
MemberName 99(PS_OUTPUT) 0 "Color"
|
||||
MemberName 99(PS_OUTPUT) 1 "Depth"
|
||||
Name 101 "psout"
|
||||
Name 109 "g_tTex1df4"
|
||||
Name 112 "g_tTex1di4"
|
||||
Name 115 "g_tTex1du4"
|
||||
Name 118 "g_tTex2df4"
|
||||
Name 121 "g_tTex2di4"
|
||||
Name 124 "g_tTex2du4"
|
||||
Name 127 "g_tTex3df4"
|
||||
Name 130 "g_tTex3di4"
|
||||
Name 133 "g_tTex3du4"
|
||||
Name 136 "g_tTexcdf4"
|
||||
Name 139 "g_tTexcdi4"
|
||||
Name 142 "g_tTexcdu4"
|
||||
Name 145 "g_tTexcdf4a"
|
||||
Name 148 "g_tTexcdi4a"
|
||||
Name 151 "g_tTexcdu4a"
|
||||
Name 113 "g_tTex1df4"
|
||||
Name 116 "g_tTex1di4"
|
||||
Name 119 "g_tTex1du4"
|
||||
Name 122 "g_tTex2df4"
|
||||
Name 125 "g_tTex2di4"
|
||||
Name 128 "g_tTex2du4"
|
||||
Name 131 "g_tTex3df4"
|
||||
Name 134 "g_tTex3di4"
|
||||
Name 137 "g_tTex3du4"
|
||||
Name 140 "g_tTexcdf4"
|
||||
Name 143 "g_tTexcdi4"
|
||||
Name 146 "g_tTexcdu4"
|
||||
Name 149 "g_tTexcdf4a"
|
||||
Name 152 "g_tTexcdi4a"
|
||||
Name 155 "g_tTexcdu4a"
|
||||
Decorate 11(g_tTex1df4a) DescriptorSet 0
|
||||
Decorate 15(g_sSamp) DescriptorSet 0
|
||||
Decorate 34(g_tTex1di4a) DescriptorSet 0
|
||||
@@ -350,21 +370,21 @@ gl_FragCoord origin is upper left
|
||||
Decorate 77(g_tTex2di4a) DescriptorSet 0
|
||||
Decorate 89(g_tTex2du4a) DescriptorSet 0
|
||||
MemberDecorate 99(PS_OUTPUT) 1 BuiltIn FragDepth
|
||||
Decorate 109(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 112(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 115(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 118(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 121(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 124(g_tTex2du4) DescriptorSet 0
|
||||
Decorate 127(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 130(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 133(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 136(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 139(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 142(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 145(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 148(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 151(g_tTexcdu4a) DescriptorSet 0
|
||||
Decorate 113(g_tTex1df4) DescriptorSet 0
|
||||
Decorate 116(g_tTex1di4) DescriptorSet 0
|
||||
Decorate 119(g_tTex1du4) DescriptorSet 0
|
||||
Decorate 122(g_tTex2df4) DescriptorSet 0
|
||||
Decorate 125(g_tTex2di4) DescriptorSet 0
|
||||
Decorate 128(g_tTex2du4) DescriptorSet 0
|
||||
Decorate 131(g_tTex3df4) DescriptorSet 0
|
||||
Decorate 134(g_tTex3di4) DescriptorSet 0
|
||||
Decorate 137(g_tTex3du4) DescriptorSet 0
|
||||
Decorate 140(g_tTexcdf4) DescriptorSet 0
|
||||
Decorate 143(g_tTexcdi4) DescriptorSet 0
|
||||
Decorate 146(g_tTexcdu4) DescriptorSet 0
|
||||
Decorate 149(g_tTexcdf4a) DescriptorSet 0
|
||||
Decorate 152(g_tTexcdi4a) DescriptorSet 0
|
||||
Decorate 155(g_tTexcdu4a) DescriptorSet 0
|
||||
2: TypeVoid
|
||||
3: TypeFunction 2
|
||||
6: TypeFloat 32
|
||||
@@ -420,53 +440,56 @@ gl_FragCoord origin is upper left
|
||||
98: TypeVector 6(float) 4
|
||||
99(PS_OUTPUT): TypeStruct 98(fvec4) 6(float)
|
||||
100: TypePointer Function 99(PS_OUTPUT)
|
||||
102: 27(int) Constant 1
|
||||
102: 27(int) Constant 0
|
||||
103: 6(float) Constant 1065353216
|
||||
107: TypeImage 6(float) 1D sampled format:Unknown
|
||||
108: TypePointer UniformConstant 107
|
||||
109(g_tTex1df4): 108(ptr) Variable UniformConstant
|
||||
110: TypeImage 27(int) 1D sampled format:Unknown
|
||||
111: TypePointer UniformConstant 110
|
||||
112(g_tTex1di4): 111(ptr) Variable UniformConstant
|
||||
113: TypeImage 44(int) 1D sampled format:Unknown
|
||||
114: TypePointer UniformConstant 113
|
||||
115(g_tTex1du4): 114(ptr) Variable UniformConstant
|
||||
116: TypeImage 6(float) 2D sampled format:Unknown
|
||||
117: TypePointer UniformConstant 116
|
||||
118(g_tTex2df4): 117(ptr) Variable UniformConstant
|
||||
119: TypeImage 27(int) 2D sampled format:Unknown
|
||||
120: TypePointer UniformConstant 119
|
||||
121(g_tTex2di4): 120(ptr) Variable UniformConstant
|
||||
122: TypeImage 44(int) 2D sampled format:Unknown
|
||||
123: TypePointer UniformConstant 122
|
||||
124(g_tTex2du4): 123(ptr) Variable UniformConstant
|
||||
125: TypeImage 6(float) 3D sampled format:Unknown
|
||||
126: TypePointer UniformConstant 125
|
||||
127(g_tTex3df4): 126(ptr) Variable UniformConstant
|
||||
128: TypeImage 27(int) 3D sampled format:Unknown
|
||||
129: TypePointer UniformConstant 128
|
||||
130(g_tTex3di4): 129(ptr) Variable UniformConstant
|
||||
131: TypeImage 44(int) 3D sampled format:Unknown
|
||||
132: TypePointer UniformConstant 131
|
||||
133(g_tTex3du4): 132(ptr) Variable UniformConstant
|
||||
134: TypeImage 6(float) Cube sampled format:Unknown
|
||||
135: TypePointer UniformConstant 134
|
||||
136(g_tTexcdf4): 135(ptr) Variable UniformConstant
|
||||
137: TypeImage 27(int) Cube sampled format:Unknown
|
||||
138: TypePointer UniformConstant 137
|
||||
139(g_tTexcdi4): 138(ptr) Variable UniformConstant
|
||||
140: TypeImage 44(int) Cube sampled format:Unknown
|
||||
141: TypePointer UniformConstant 140
|
||||
142(g_tTexcdu4): 141(ptr) Variable UniformConstant
|
||||
143: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
144: TypePointer UniformConstant 143
|
||||
145(g_tTexcdf4a): 144(ptr) Variable UniformConstant
|
||||
146: TypeImage 27(int) Cube array sampled format:Unknown
|
||||
147: TypePointer UniformConstant 146
|
||||
148(g_tTexcdi4a): 147(ptr) Variable UniformConstant
|
||||
149: TypeImage 44(int) Cube array sampled format:Unknown
|
||||
150: TypePointer UniformConstant 149
|
||||
151(g_tTexcdu4a): 150(ptr) Variable UniformConstant
|
||||
104: 98(fvec4) ConstantComposite 103 103 103 103
|
||||
105: TypePointer Function 98(fvec4)
|
||||
107: 27(int) Constant 1
|
||||
111: TypeImage 6(float) 1D sampled format:Unknown
|
||||
112: TypePointer UniformConstant 111
|
||||
113(g_tTex1df4): 112(ptr) Variable UniformConstant
|
||||
114: TypeImage 27(int) 1D sampled format:Unknown
|
||||
115: TypePointer UniformConstant 114
|
||||
116(g_tTex1di4): 115(ptr) Variable UniformConstant
|
||||
117: TypeImage 44(int) 1D sampled format:Unknown
|
||||
118: TypePointer UniformConstant 117
|
||||
119(g_tTex1du4): 118(ptr) Variable UniformConstant
|
||||
120: TypeImage 6(float) 2D sampled format:Unknown
|
||||
121: TypePointer UniformConstant 120
|
||||
122(g_tTex2df4): 121(ptr) Variable UniformConstant
|
||||
123: TypeImage 27(int) 2D sampled format:Unknown
|
||||
124: TypePointer UniformConstant 123
|
||||
125(g_tTex2di4): 124(ptr) Variable UniformConstant
|
||||
126: TypeImage 44(int) 2D sampled format:Unknown
|
||||
127: TypePointer UniformConstant 126
|
||||
128(g_tTex2du4): 127(ptr) Variable UniformConstant
|
||||
129: TypeImage 6(float) 3D sampled format:Unknown
|
||||
130: TypePointer UniformConstant 129
|
||||
131(g_tTex3df4): 130(ptr) Variable UniformConstant
|
||||
132: TypeImage 27(int) 3D sampled format:Unknown
|
||||
133: TypePointer UniformConstant 132
|
||||
134(g_tTex3di4): 133(ptr) Variable UniformConstant
|
||||
135: TypeImage 44(int) 3D sampled format:Unknown
|
||||
136: TypePointer UniformConstant 135
|
||||
137(g_tTex3du4): 136(ptr) Variable UniformConstant
|
||||
138: TypeImage 6(float) Cube sampled format:Unknown
|
||||
139: TypePointer UniformConstant 138
|
||||
140(g_tTexcdf4): 139(ptr) Variable UniformConstant
|
||||
141: TypeImage 27(int) Cube sampled format:Unknown
|
||||
142: TypePointer UniformConstant 141
|
||||
143(g_tTexcdi4): 142(ptr) Variable UniformConstant
|
||||
144: TypeImage 44(int) Cube sampled format:Unknown
|
||||
145: TypePointer UniformConstant 144
|
||||
146(g_tTexcdu4): 145(ptr) Variable UniformConstant
|
||||
147: TypeImage 6(float) Cube array sampled format:Unknown
|
||||
148: TypePointer UniformConstant 147
|
||||
149(g_tTexcdf4a): 148(ptr) Variable UniformConstant
|
||||
150: TypeImage 27(int) Cube array sampled format:Unknown
|
||||
151: TypePointer UniformConstant 150
|
||||
152(g_tTexcdi4a): 151(ptr) Variable UniformConstant
|
||||
153: TypeImage 44(int) Cube array sampled format:Unknown
|
||||
154: TypePointer UniformConstant 153
|
||||
155(g_tTexcdu4a): 154(ptr) Variable UniformConstant
|
||||
4(main): 2 Function None 3
|
||||
5: Label
|
||||
8(r11): 7(ptr) Variable Function
|
||||
@@ -518,8 +541,10 @@ gl_FragCoord origin is upper left
|
||||
96: 6(float) CompositeExtract 95 0
|
||||
97: 6(float) ImageSampleDrefExplicitLod 94 95 96 Lod ConstOffset 26 71
|
||||
Store 86(r35) 97
|
||||
104: 7(ptr) AccessChain 101(psout) 102
|
||||
Store 104 103
|
||||
105:99(PS_OUTPUT) Load 101(psout)
|
||||
ReturnValue 105
|
||||
106: 105(ptr) AccessChain 101(psout) 102
|
||||
Store 106 104
|
||||
108: 7(ptr) AccessChain 101(psout) 107
|
||||
Store 108 103
|
||||
109:99(PS_OUTPUT) Load 101(psout)
|
||||
ReturnValue 109
|
||||
FunctionEnd
|
||||
|
||||
Reference in New Issue
Block a user