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

44
Test/baseResults/hlsl.samplebias.basic.dx10.frag.out
View File

@@ -152,6 +152,16 @@ gl_FragCoord origin is upper left
0:? 0.900000
0:45 Constant:
0:45 0.500000
0:47 move second child to first child (temp 4-component vector of float)
0:47 Color: direct index for structure (temp 4-component vector of float)
0:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:47 Constant:
0:47 0 (const int)
0:47 Constant:
0:47 1.000000
0:47 1.000000
0:47 1.000000
0:47 1.000000
0:48 move second child to first child (temp float)
0:48 Depth: direct index for structure (temp float FragDepth)
0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@@ -334,6 +344,16 @@ gl_FragCoord origin is upper left
0:? 0.900000
0:45 Constant:
0:45 0.500000
0:47 move second child to first child (temp 4-component vector of float)
0:47 Color: direct index for structure (temp 4-component vector of float)
0:47 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:47 Constant:
0:47 0 (const int)
0:47 Constant:
0:47 1.000000
0:47 1.000000
0:47 1.000000
0:47 1.000000
0:48 move second child to first child (temp float)
0:48 Depth: direct index for structure (temp float FragDepth)
0:48 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@@ -361,7 +381,7 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 153
// Id's are bound by 156
Capability Shader
Capability Sampled1D
@@ -400,7 +420,7 @@ gl_FragCoord origin is upper left
MemberName 143(PS_OUTPUT) 0 "Color"
MemberName 143(PS_OUTPUT) 1 "Depth"
Name 145 "psout"
Name 152 "g_tTex1df4a"
Name 155 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 29(g_tTex1di4) DescriptorSet 0
@@ -415,7 +435,7 @@ gl_FragCoord origin is upper left
Decorate 128(g_tTexcdi4) DescriptorSet 0
Decorate 137(g_tTexcdu4) DescriptorSet 0
MemberDecorate 143(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 152(g_tTex1df4a) DescriptorSet 0
Decorate 155(g_tTex1df4a) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@@ -497,10 +517,12 @@ gl_FragCoord origin is upper left
140: TypeSampledImage 135
143(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
144: TypePointer Function 143(PS_OUTPUT)
146: 23(int) Constant 1
146: 23(int) Constant 0
147: 6(float) Constant 1065353216
148: TypePointer Function 6(float)
152(g_tTex1df4a): 11(ptr) Variable UniformConstant
148: 7(fvec4) ConstantComposite 147 147 147 147
150: 23(int) Constant 1
151: TypePointer Function 6(float)
155(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@@ -576,8 +598,10 @@ gl_FragCoord origin is upper left
141: 140 SampledImage 138 139
142: 37(ivec4) ImageSampleImplicitLod 141 114 Bias 21
Store 134(txval42) 142
149: 148(ptr) AccessChain 145(psout) 146
Store 149 147
150:143(PS_OUTPUT) Load 145(psout)
ReturnValue 150
149: 8(ptr) AccessChain 145(psout) 146
Store 149 148
152: 151(ptr) AccessChain 145(psout) 150
Store 152 147
153:143(PS_OUTPUT) Load 145(psout)
ReturnValue 153
FunctionEnd