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

HLSL: Remove recent change to put locations on SV_TARGET*.

Browse source 
This put locations on members of structures, which is not allowed
in either AST or SPIR-V.

This was caught by asserts in the debug build.
This commit is contained in:
John Kessenich 2016-08-29 16:49:39 -06:00
parent 510d83b384
commit a05d8b5604
56 changed files with 712 additions and 764 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Test/baseResults/hlsl.samplelevel.basic.dx10.frag.out
View file

@ -2,7 +2,7 @@ hlsl.samplelevel.basic.dx10.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:53 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:53 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:29 Function Parameters:
0:? Sequence
0:32 Sequence
@ -153,8 +153,8 @@ gl_FragCoord origin is upper left
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 (layout(location=0 ) temp 4-component vector of float)
0:48 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
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:
@ -164,15 +164,15 @@ gl_FragCoord origin is upper left
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{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:49 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:49 Constant:
0:49 1 (const int)
0:49 Constant:
0:49 1.000000
0:51 Sequence
0:51 move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
@ -198,7 +198,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:53 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:53 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:29 Function Parameters:
0:? Sequence
0:32 Sequence
@ -349,8 +349,8 @@ gl_FragCoord origin is upper left
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 (layout(location=0 ) temp 4-component vector of float)
0:48 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
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:
@ -360,15 +360,15 @@ gl_FragCoord origin is upper left
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{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:49 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:49 Constant:
0:49 1 (const int)
0:49 Constant:
0:49 1.000000
0:51 Sequence
0:51 move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
@ -445,7 +445,6 @@ gl_FragCoord origin is upper left
Decorate 120(g_tTexcdf4) DescriptorSet 0
Decorate 129(g_tTexcdi4) DescriptorSet 0
Decorate 138(g_tTexcdu4) DescriptorSet 0
MemberDecorate 144(PS_OUTPUT) 0 Location 0
MemberDecorate 144(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 158(g_sSamp2d) DescriptorSet 0
Decorate 159(g_tTex1df4a) DescriptorSet 0