BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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.samplegrad.array.dx10.frag.out
View file

@ -158,6 +158,16 @@ gl_FragCoord origin is upper left
0:? 1.100000
0:? 1.200000
0:? 1.300000
0:39 move second child to first child (temp 4-component vector of float)
0:39 Color: direct index for structure (temp 4-component vector of float)
0:39 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:39 Constant:
0:39 0 (const int)
0:39 Constant:
0:39 1.000000
0:39 1.000000
0:39 1.000000
0:39 1.000000
0:40 move second child to first child (temp float)
0:40 Depth: direct index for structure (temp float FragDepth)
0:40 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@ -343,6 +353,16 @@ gl_FragCoord origin is upper left
0:? 1.100000
0:? 1.200000
0:? 1.300000
0:39 move second child to first child (temp 4-component vector of float)
0:39 Color: direct index for structure (temp 4-component vector of float)
0:39 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:39 Constant:
0:39 0 (const int)
0:39 Constant:
0:39 1.000000
0:39 1.000000
0:39 1.000000
0:39 1.000000
0:40 move second child to first child (temp float)
0:40 Depth: direct index for structure (temp float FragDepth)
0:40 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@ -367,7 +387,7 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 123
// Id's are bound by 126
Capability Shader
Capability Sampled1D
@ -401,7 +421,7 @@ gl_FragCoord origin is upper left
MemberName 113(PS_OUTPUT) 0 "Color"
MemberName 113(PS_OUTPUT) 1 "Depth"
Name 115 "psout"
Name 122 "g_tTex1df4a"
Name 125 "g_tTex1df4a"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 16(g_sSamp) DescriptorSet 0
Decorate 33(g_tTex1di4) DescriptorSet 0
@ -413,7 +433,7 @@ gl_FragCoord origin is upper left
Decorate 98(g_tTexcdi4) DescriptorSet 0
Decorate 107(g_tTexcdu4) DescriptorSet 0
MemberDecorate 113(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 122(g_tTex1df4a) DescriptorSet 0
Decorate 125(g_tTex1df4a) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32
@ -480,10 +500,12 @@ gl_FragCoord origin is upper left
110: TypeSampledImage 105
113(PS_OUTPUT): TypeStruct 7(fvec4) 6(float)
114: TypePointer Function 113(PS_OUTPUT)
116: 27(int) Constant 1
116: 27(int) Constant 0
117: 6(float) Constant 1065353216
118: TypePointer Function 6(float)
122(g_tTex1df4a): 11(ptr) Variable UniformConstant
118: 7(fvec4) ConstantComposite 117 117 117 117
120: 27(int) Constant 1
121: TypePointer Function 6(float)
125(g_tTex1df4a): 11(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
9(txval10): 8(ptr) Variable Function
@ -541,8 +563,10 @@ gl_FragCoord origin is upper left
111: 110 SampledImage 108 109
112: 40(ivec4) ImageSampleExplicitLod 111 91 Grad 93 93
Store 104(txval42) 112
119: 118(ptr) AccessChain 115(psout) 116
Store 119 117
120:113(PS_OUTPUT) Load 115(psout)
ReturnValue 120
119: 8(ptr) AccessChain 115(psout) 116
Store 119 118
122: 121(ptr) AccessChain 115(psout) 120
Store 122 117
123:113(PS_OUTPUT) Load 115(psout)
ReturnValue 123
FunctionEnd