mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Add shape conversions for scalar -> vector assigments.

Browse Source 
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
2016-07-28 17:53:56 -06:00
parent a26a5170a3
commit fea226ba43
46 changed files with 2571 additions and 1413 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
View File

@@ -152,6 +152,16 @@ gl_FragCoord origin is upper left
0:? 0.900000
0:46 Constant:
0:46 0.750000
0:48 move second child to first child (temp 4-component vector of float)
0:48 Color: direct index for structure (temp 4-component vector of float)
0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Constant:
0:48 0 (const int)
0:48 Constant:
0:48 1.000000
0:48 1.000000
0:48 1.000000
0:48 1.000000
0:49 move second child to first child (temp float)
0:49 Depth: direct index for structure (temp float FragDepth)
0:49 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@@ -335,6 +345,16 @@ gl_FragCoord origin is upper left
0:? 0.900000
0:46 Constant:
0:46 0.750000
0:48 move second child to first child (temp 4-component vector of float)
0:48 Color: direct index for structure (temp 4-component vector of float)
0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:48 Constant:
0:48 0 (const int)
0:48 Constant:
0:48 1.000000
0:48 1.000000
0:48 1.000000
0:48 1.000000
0:49 move second child to first child (temp float)
0:49 Depth: direct index for structure (temp float FragDepth)
0:49 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@@ -363,7 +383,7 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 155
// Id's are bound by 158
Capability Shader
Capability Sampled1D
@@ -402,8 +422,8 @@ gl_FragCoord origin is upper left
MemberName 144(PS_OUTPUT) 0 "Color"
MemberName 144(PS_OUTPUT) 1 "Depth"
Name 146 "psout"
Name 153 "g_sSamp2d"
Name 154 "g_tTex1df4a"
Name 156 "g_sSamp2d"
Name 157 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 29(g_tTex1di4) DescriptorSet 0
@@ -418,8 +438,8 @@ gl_FragCoord origin is upper left
Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 153(g_sSamp2d) DescriptorSet 0
Decorate 154(g_tTex1df4a) DescriptorSet 0
Decorate 156(g_sSamp2d) DescriptorSet 0
Decorate 157(g_tTex1df4a) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -502,11 +522,13 @@ gl_FragCoord origin is upper left
141: TypeSampledImage 136
144(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
145: TypePointer Function 144(PS_OUTPUT)
147: 23(int) Constant 1
147: 23(int) Constant 0
148: 6(float) Constant 1065353216
149: TypePointer Function 6(float)
153(g_sSamp2d): 15(ptr) Variable UniformConstant
154(g_tTex1df4a): 11(ptr) Variable UniformConstant
149: 7(fvec4) ConstantComposite 148 148 148 148
151: 23(int) Constant 1
152: TypePointer Function 6(float)
156(g_sSamp2d): 15(ptr) Variable UniformConstant
157(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -582,8 +604,10 @@ gl_FragCoord origin is upper left
142: 141 SampledImage 139 140
143: 37(ivec4) ImageSampleExplicitLod 142 115 Lod 21
Store 135(txval42) 143
150: 149(ptr) AccessChain 146(psout) 147
Store 150 148
151:144(PS_OUTPUT) Load 146(psout)
ReturnValue 151
150: 8(ptr) AccessChain 146(psout) 147
Store 150 149
153: 152(ptr) AccessChain 146(psout) 151
Store 153 148
154:144(PS_OUTPUT) Load 146(psout)
ReturnValue 154
FunctionEnd