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

@@ -6,12 +6,12 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:8 Function Definition: MyFunc2( (global void)
0:8 Function Parameters:
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:13 Function Parameters:
0:? Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:16 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:16 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:16 color: direct index for structure (temp 4-component vector of float)
0:16 'ps_output' (temp structure{temp 4-component vector of float color})
0:16 Constant:
0:16 0 (const int)
0:16 Constant:
@@ -20,9 +20,9 @@ gl_FragCoord origin is upper left
0:16 1.000000
0:16 1.000000
0:17 Sequence
0:17 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:17 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:17 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:17 'ps_output' (temp structure{temp 4-component vector of float color})
0:17 Branch: Return
0:? Linker Objects
@@ -37,12 +37,12 @@ gl_FragCoord origin is upper left
0:2 Function Parameters:
0:8 Function Definition: MyFunc2( (global void)
0:8 Function Parameters:
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:13 Function Parameters:
0:? Sequence
0:16 move second child to first child (temp 4-component vector of float)
0:16 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:16 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:16 color: direct index for structure (temp 4-component vector of float)
0:16 'ps_output' (temp structure{temp 4-component vector of float color})
0:16 Constant:
0:16 0 (const int)
0:16 Constant:
@@ -51,9 +51,9 @@ gl_FragCoord origin is upper left
0:16 1.000000
0:16 1.000000
0:17 Sequence
0:17 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:17 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:17 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:17 'ps_output' (temp structure{temp 4-component vector of float color})
0:17 Branch: Return
0:? Linker Objects
@@ -73,7 +73,6 @@ gl_FragCoord origin is upper left
MemberName 12(PS_OUTPUT) 0 "color"
Name 14 "ps_output"
Name 22 "@entryPointOutput"
MemberDecorate 12(PS_OUTPUT) 0 Location 0
2: TypeVoid
3: TypeFunction 2
10: TypeFloat 32