mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.init2.frag.out
View File

@@ -29,13 +29,13 @@ gl_FragCoord origin is upper left
0:20 8.000000
0:20 9.000000
0:20 10.000000
0:33 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
0:33 Function Definition: main( (global structure{temp 4-component vector of float color})
0:26 Function Parameters:
0:? Sequence
0:27 Function Call: Test1( (global void)
0:30 move second child to first child (temp 4-component vector of float)
0:30 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:30 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:30 color: direct index for structure (temp 4-component vector of float)
0:30 'ps_output' (temp structure{temp 4-component vector of float color})
0:30 Constant:
0:30 0 (const int)
0:30 Constant:
@@ -44,9 +44,9 @@ gl_FragCoord origin is upper left
0:30 1.000000
0:30 1.000000
0:31 Sequence
0:31 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:31 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:31 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:31 'ps_output' (temp structure{temp 4-component vector of float color})
0:31 Branch: Return
0:? Linker Objects
@@ -84,13 +84,13 @@ gl_FragCoord origin is upper left
0:20 8.000000
0:20 9.000000
0:20 10.000000
0:33 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
0:33 Function Definition: main( (global structure{temp 4-component vector of float color})
0:26 Function Parameters:
0:? Sequence
0:27 Function Call: Test1( (global void)
0:30 move second child to first child (temp 4-component vector of float)
0:30 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:30 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:30 color: direct index for structure (temp 4-component vector of float)
0:30 'ps_output' (temp structure{temp 4-component vector of float color})
0:30 Constant:
0:30 0 (const int)
0:30 Constant:
@@ -99,9 +99,9 @@ gl_FragCoord origin is upper left
0:30 1.000000
0:30 1.000000
0:31 Sequence
0:31 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:31 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:31 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:31 'ps_output' (temp structure{temp 4-component vector of float color})
0:31 Branch: Return
0:? Linker Objects
@@ -130,7 +130,6 @@ gl_FragCoord origin is upper left
MemberName 34(PS_OUTPUT) 0 "color"
Name 36 "ps_output"
Name 43 "@entryPointOutput"
MemberDecorate 34(PS_OUTPUT) 0 Location 0
2: TypeVoid
3: TypeFunction 2
8: TypeFloat 32