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

49
Test/baseResults/hlsl.getdimensions.dx10.frag.out
View file

@ -1043,6 +1043,16 @@ gl_FragCoord origin is upper left
0:164 'NumberOfSamplesU' (temp uint)
0:164 imageQuerySamples (temp uint)
0:164 'g_tTex2dmsu4a' (uniform utexture2DMSArray)
0:276 move second child to first child (temp 4-component vector of float)
0:276 Color: direct index for structure (temp 4-component vector of float)
0:276 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:276 Constant:
0:276 0 (const int)
0:276 Constant:
0:276 1.000000
0:276 1.000000
0:276 1.000000
0:276 1.000000
0:277 move second child to first child (temp float)
0:277 Depth: direct index for structure (temp float FragDepth)
0:277 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@ -2130,6 +2140,16 @@ gl_FragCoord origin is upper left
0:164 'NumberOfSamplesU' (temp uint)
0:164 imageQuerySamples (temp uint)
0:164 'g_tTex2dmsu4a' (uniform utexture2DMSArray)
0:276 move second child to first child (temp 4-component vector of float)
0:276 Color: direct index for structure (temp 4-component vector of float)
0:276 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:276 Constant:
0:276 0 (const int)
0:276 Constant:
0:276 1.000000
0:276 1.000000
0:276 1.000000
0:276 1.000000
0:277 move second child to first child (temp float)
0:277 Depth: direct index for structure (temp float FragDepth)
0:277 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
@ -2171,7 +2191,7 @@ gl_FragCoord origin is upper left
// Module Version 10000
// Generated by (magic number): 80001
// Id's are bound by 534
// Id's are bound by 538
Capability Shader
Capability Sampled1D
@ -2269,7 +2289,7 @@ gl_FragCoord origin is upper left
MemberName 522(PS_OUTPUT) 0 "Color"
MemberName 522(PS_OUTPUT) 1 "Depth"
Name 524 "psout"
Name 533 "g_sSamp"
Name 537 "g_sSamp"
Decorate 12(g_tTex1df4) DescriptorSet 0
Decorate 29(g_tTex1di4) DescriptorSet 0
Decorate 42(g_tTex1du4) DescriptorSet 0
@ -2298,7 +2318,7 @@ gl_FragCoord origin is upper left
Decorate 496(g_tTex2dmsi4a) DescriptorSet 0
Decorate 510(g_tTex2dmsu4a) DescriptorSet 0
MemberDecorate 522(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 533(g_sSamp) DescriptorSet 0
Decorate 537(g_sSamp) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 0
@ -2399,12 +2419,15 @@ gl_FragCoord origin is upper left
521: TypeVector 9(float) 4
522(PS_OUTPUT): TypeStruct 521(fvec4) 9(float)
523: TypePointer Function 522(PS_OUTPUT)
525: 14(int) Constant 1
525: 14(int) Constant 0
526: 9(float) Constant 1065353216
527: TypePointer Function 9(float)
531: TypeSampler
532: TypePointer UniformConstant 531
533(g_sSamp): 532(ptr) Variable UniformConstant
527: 521(fvec4) ConstantComposite 526 526 526 526
528: TypePointer Function 521(fvec4)
530: 14(int) Constant 1
531: TypePointer Function 9(float)
535: TypeSampler
536: TypePointer UniformConstant 535
537(g_sSamp): 536(ptr) Variable UniformConstant
4(main): 2 Function None 3
5: Label
8(sizeQueryTemp): 7(ptr) Variable Function
@ -3014,8 +3037,10 @@ gl_FragCoord origin is upper left
519: 508 Load 510(g_tTex2dmsu4a)
520: 14(int) ImageQuerySamples 519
Store 452(NumberOfSamplesU) 520
528: 527(ptr) AccessChain 524(psout) 525
Store 528 526
529:522(PS_OUTPUT) Load 524(psout)
ReturnValue 529
529: 528(ptr) AccessChain 524(psout) 525
Store 529 527
532: 531(ptr) AccessChain 524(psout) 530
Store 532 526
533:522(PS_OUTPUT) Load 524(psout)
ReturnValue 533
FunctionEnd