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

HLSL: Wrap the entry-point; need to write 'in' args, and support 'inout' args.

Browse source 
This needs some render testing, but is destined to be part of master.

This also leads to a variety of other simplifications.
 - IO are global symbols, so only need one list of linkage nodes (deferred)
 - no longer need parse-context-wide 'inEntryPoint' state, entry-point is localized
 - several parts of splitting/flattening are now localized
This commit is contained in:
John Kessenich 2017-01-19 15:41:47 -07:00
parent 18adbdbbb8
commit 02467d8d94
171 changed files with 37604 additions and 32679 deletions
Download patch file Download diff file Expand all files Collapse all files

122
Test/baseResults/hlsl.intrinsics.negative.frag.out
View file

@ -250,49 +250,68 @@ ERROR: node is still EOpNull!
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:80 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:80 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:80 Function Parameters:
0:80 'inF0' (layout(location=0 ) in 4-component vector of float)
0:80 'inF1' (layout(location=1 ) in 4-component vector of float)
0:80 'inF2' (layout(location=2 ) in 4-component vector of float)
0:80 'inI0' (layout(location=3 ) in 4-component vector of int)
0:80 'inF0' (in 4-component vector of float)
0:80 'inF1' (in 4-component vector of float)
0:80 'inF2' (in 4-component vector of float)
0:80 'inI0' (in 4-component vector of int)
0:? Sequence
0:81 Constant:
0:81 0.000000
0:82 bitCount (temp 4-component vector of uint)
0:82 Convert float to uint (temp 4-component vector of uint)
0:82 'inF0' (layout(location=0 ) in 4-component vector of float)
0:82 'inF0' (in 4-component vector of float)
0:83 cross-product (temp 3-component vector of float)
0:83 Construct vec3 (in 3-component vector of float)
0:83 'inF0' (layout(location=0 ) in 4-component vector of float)
0:83 'inF0' (in 4-component vector of float)
0:83 Construct vec3 (in 3-component vector of float)
0:83 'inF1' (layout(location=1 ) in 4-component vector of float)
0:83 'inF1' (in 4-component vector of float)
0:84 Constant:
0:84 0.000000
0:85 ERROR: Bad unary op
(temp 4-component vector of float)
0:85 Convert float to uint (temp 4-component vector of uint)
0:85 'inF0' (layout(location=0 ) in 4-component vector of float)
0:85 'inF0' (in 4-component vector of float)
0:86 findMSB (temp 4-component vector of uint)
0:86 Convert float to uint (temp 4-component vector of uint)
0:86 'inF0' (layout(location=0 ) in 4-component vector of float)
0:86 'inF0' (in 4-component vector of float)
0:87 findLSB (temp 4-component vector of uint)
0:87 Convert float to uint (temp 4-component vector of uint)
0:87 'inF0' (layout(location=0 ) in 4-component vector of float)
0:87 'inF0' (in 4-component vector of float)
0:89 bitFieldReverse (temp 4-component vector of uint)
0:89 Convert float to uint (temp 4-component vector of uint)
0:89 'inF0' (layout(location=0 ) in 4-component vector of float)
0:89 'inF0' (in 4-component vector of float)
0:90 Constant:
0:90 0.000000
0:92 Sequence
0:92 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:? 4.000000
0:92 Branch: Return
0:92 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:? 4.000000
0:80 Function Definition: PixelShaderFunction( (temp void)
0:80 Function Parameters:
0:? Sequence
0:80 move second child to first child (temp 4-component vector of float)
0:? 'inF0' (temp 4-component vector of float)
0:? 'inF0' (layout(location=0 ) in 4-component vector of float)
0:80 move second child to first child (temp 4-component vector of float)
0:? 'inF1' (temp 4-component vector of float)
0:? 'inF1' (layout(location=1 ) in 4-component vector of float)
0:80 move second child to first child (temp 4-component vector of float)
0:? 'inF2' (temp 4-component vector of float)
0:? 'inF2' (layout(location=2 ) in 4-component vector of float)
0:80 move second child to first child (temp 4-component vector of int)
0:? 'inI0' (temp 4-component vector of int)
0:? 'inI0' (layout(location=3 ) in 4-component vector of int)
0:80 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:80 Function Call: @PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:? 'inF0' (temp 4-component vector of float)
0:? 'inF1' (temp 4-component vector of float)
0:? 'inF2' (temp 4-component vector of float)
0:? 'inI0' (temp 4-component vector of int)
0:115 Function Definition: PixelShaderFunction2x2(mf22;mf22;mf22; (temp 2X2 matrix of float)
0:115 Function Parameters:
0:115 'inF0' (in 2X2 matrix of float)
@ -619,49 +638,68 @@ ERROR: node is still EOpNull!
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:80 Function Definition: PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:80 Function Definition: @PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:80 Function Parameters:
0:80 'inF0' (layout(location=0 ) in 4-component vector of float)
0:80 'inF1' (layout(location=1 ) in 4-component vector of float)
0:80 'inF2' (layout(location=2 ) in 4-component vector of float)
0:80 'inI0' (layout(location=3 ) in 4-component vector of int)
0:80 'inF0' (in 4-component vector of float)
0:80 'inF1' (in 4-component vector of float)
0:80 'inF2' (in 4-component vector of float)
0:80 'inI0' (in 4-component vector of int)
0:? Sequence
0:81 Constant:
0:81 0.000000
0:82 bitCount (temp 4-component vector of uint)
0:82 Convert float to uint (temp 4-component vector of uint)
0:82 'inF0' (layout(location=0 ) in 4-component vector of float)
0:82 'inF0' (in 4-component vector of float)
0:83 cross-product (temp 3-component vector of float)
0:83 Construct vec3 (in 3-component vector of float)
0:83 'inF0' (layout(location=0 ) in 4-component vector of float)
0:83 'inF0' (in 4-component vector of float)
0:83 Construct vec3 (in 3-component vector of float)
0:83 'inF1' (layout(location=1 ) in 4-component vector of float)
0:83 'inF1' (in 4-component vector of float)
0:84 Constant:
0:84 0.000000
0:85 ERROR: Bad unary op
(temp 4-component vector of float)
0:85 Convert float to uint (temp 4-component vector of uint)
0:85 'inF0' (layout(location=0 ) in 4-component vector of float)
0:85 'inF0' (in 4-component vector of float)
0:86 findMSB (temp 4-component vector of uint)
0:86 Convert float to uint (temp 4-component vector of uint)
0:86 'inF0' (layout(location=0 ) in 4-component vector of float)
0:86 'inF0' (in 4-component vector of float)
0:87 findLSB (temp 4-component vector of uint)
0:87 Convert float to uint (temp 4-component vector of uint)
0:87 'inF0' (layout(location=0 ) in 4-component vector of float)
0:87 'inF0' (in 4-component vector of float)
0:89 bitFieldReverse (temp 4-component vector of uint)
0:89 Convert float to uint (temp 4-component vector of uint)
0:89 'inF0' (layout(location=0 ) in 4-component vector of float)
0:89 'inF0' (in 4-component vector of float)
0:90 Constant:
0:90 0.000000
0:92 Sequence
0:92 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:? 4.000000
0:92 Branch: Return
0:92 Branch: Return with expression
0:? Constant:
0:? 1.000000
0:? 2.000000
0:? 3.000000
0:? 4.000000
0:80 Function Definition: PixelShaderFunction( (temp void)
0:80 Function Parameters:
0:? Sequence
0:80 move second child to first child (temp 4-component vector of float)
0:? 'inF0' (temp 4-component vector of float)
0:? 'inF0' (layout(location=0 ) in 4-component vector of float)
0:80 move second child to first child (temp 4-component vector of float)
0:? 'inF1' (temp 4-component vector of float)
0:? 'inF1' (layout(location=1 ) in 4-component vector of float)
0:80 move second child to first child (temp 4-component vector of float)
0:? 'inF2' (temp 4-component vector of float)
0:? 'inF2' (layout(location=2 ) in 4-component vector of float)
0:80 move second child to first child (temp 4-component vector of int)
0:? 'inI0' (temp 4-component vector of int)
0:? 'inI0' (layout(location=3 ) in 4-component vector of int)
0:80 move second child to first child (temp 4-component vector of float)
0:? '@entryPointOutput' (layout(location=0 ) out 4-component vector of float)
0:80 Function Call: @PixelShaderFunction(vf4;vf4;vf4;vi4; (temp 4-component vector of float)
0:? 'inF0' (temp 4-component vector of float)
0:? 'inF1' (temp 4-component vector of float)
0:? 'inF2' (temp 4-component vector of float)
0:? 'inI0' (temp 4-component vector of int)
0:115 Function Definition: PixelShaderFunction2x2(mf22;mf22;mf22; (temp 2X2 matrix of float)
0:115 Function Parameters:
0:115 'inF0' (in 2X2 matrix of float)