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

29
Test/baseResults/hlsl.numericsuffixes.frag.out
View File

@@ -2,7 +2,7 @@ hlsl.numericsuffixes.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:21 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
0:21 Function Definition: main( (global structure{temp 4-component vector of float color})
0:5 Function Parameters:
0:? Sequence
0:7 Sequence
@@ -51,17 +51,17 @@ gl_FragCoord origin is upper left
0:15 Constant:
0:15 58 (const uint)
0:18 move second child to first child (temp 4-component vector of float)
0:18 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:18 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:18 color: direct index for structure (temp 4-component vector of float)
0:18 'ps_output' (temp structure{temp 4-component vector of float color})
0:18 Constant:
0:18 0 (const int)
0:18 Construct vec4 (layout(location=0 ) temp 4-component vector of float)
0:18 Construct vec4 (temp 4-component vector of float)
0:18 Convert int to float (temp float)
0:18 'r07' (temp int)
0:19 Sequence
0:19 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:19 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:19 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:19 'ps_output' (temp structure{temp 4-component vector of float color})
0:19 Branch: Return
0:? Linker Objects
@@ -72,7 +72,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:21 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float color})
0:21 Function Definition: main( (global structure{temp 4-component vector of float color})
0:5 Function Parameters:
0:? Sequence
0:7 Sequence
@@ -121,17 +121,17 @@ gl_FragCoord origin is upper left
0:15 Constant:
0:15 58 (const uint)
0:18 move second child to first child (temp 4-component vector of float)
0:18 color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:18 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:18 color: direct index for structure (temp 4-component vector of float)
0:18 'ps_output' (temp structure{temp 4-component vector of float color})
0:18 Constant:
0:18 0 (const int)
0:18 Construct vec4 (layout(location=0 ) temp 4-component vector of float)
0:18 Construct vec4 (temp 4-component vector of float)
0:18 Convert int to float (temp float)
0:18 'r07' (temp int)
0:19 Sequence
0:19 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:19 'ps_output' (temp structure{layout(location=0 ) temp 4-component vector of float color})
0:19 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:19 'ps_output' (temp structure{temp 4-component vector of float color})
0:19 Branch: Return
0:? Linker Objects
@@ -158,7 +158,6 @@ gl_FragCoord origin is upper left
MemberName 30(PS_OUTPUT) 0 "color"
Name 32 "ps_output"
Name 40 "@entryPointOutput"
MemberDecorate 30(PS_OUTPUT) 0 Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32