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

25
Test/baseResults/hlsl.constructexpr.frag.out
View file

@ -2,7 +2,7 @@ hlsl.constructexpr.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:18 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
0:18 Function Definition: main( (global structure{temp 4-component vector of float color})
0:4 Function Parameters:
0:? Sequence
0:6 Constant:
@ -25,8 +25,8 @@ gl_FragCoord origin is upper left
0:? 11.000000
0:? 12.000000
0:15 move second child to first child (temp 4-component vector of float)
0:15 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:15 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:15 color: direct index for structure (temp 4-component vector of float)
0:15 'ps_output' (temp structure{temp 4-component vector of float color})
0:15 Constant:
0:15 0 (const int)
0:15 Constant:
@ -35,9 +35,9 @@ gl_FragCoord origin is upper left
0:15 1.000000
0:15 1.000000
0:16 Sequence
0:16 move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:? '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
0:16 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:16 move second child to first child (temp structure{temp 4-component vector of float color})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float color})
0:16 'ps_output' (temp structure{temp 4-component vector of float color})
0:16 Branch: Return
0:? Linker Objects
@ -48,7 +48,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:18 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
0:18 Function Definition: main( (global structure{temp 4-component vector of float color})
0:4 Function Parameters:
0:? Sequence
0:6 Constant:
@ -71,8 +71,8 @@ gl_FragCoord origin is upper left
0:? 11.000000
0:? 12.000000
0:15 move second child to first child (temp 4-component vector of float)
0:15 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:15 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:15 color: direct index for structure (temp 4-component vector of float)
0:15 'ps_output' (temp structure{temp 4-component vector of float color})
0:15 Constant:
0:15 0 (const int)
0:15 Constant:
@ -81,9 +81,9 @@ gl_FragCoord origin is upper left
0:15 1.000000
0:15 1.000000
0:16 Sequence
0:16 move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:? '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float color})
0:16 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:16 move second child to first child (temp structure{temp 4-component vector of float color})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float color})
0:16 'ps_output' (temp structure{temp 4-component vector of float color})
0:16 Branch: Return
0:? Linker Objects
@ -101,7 +101,6 @@ gl_FragCoord origin is upper left
MemberName 22(PS_OUTPUT) 0 "color"
Name 24 "ps_output"
Name 31 "@entryPointOutput"
MemberDecorate 22(PS_OUTPUT) 0 Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeInt 32 1