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

@@ -237,7 +237,7 @@ gl_FragCoord origin is upper left
0:49 Branch: Return with expression
0:49 Convert float to double (temp 3-component vector of double)
0:49 'f3' (uniform 3-component vector of float)
0:202 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
0:202 Function Definition: main( (global structure{temp 4-component vector of float Color})
0:52 Function Parameters:
0:? Sequence
0:54 Sequence
@@ -491,15 +491,15 @@ gl_FragCoord origin is upper left
0:196 Convert int to float (temp float)
0:196 'c2' (temp int)
0:199 move second child to first child (temp 4-component vector of float)
0:199 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:199 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:199 Color: direct index for structure (temp 4-component vector of float)
0:199 'psout' (temp structure{temp 4-component vector of float Color})
0:199 Constant:
0:199 0 (const int)
0:199 'outval' (temp 4-component vector of float)
0:200 Sequence
0:200 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:200 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:200 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:200 'psout' (temp structure{temp 4-component vector of float Color})
0:200 Branch: Return
0:? Linker Objects
0:? 'i3' (uniform 3-component vector of int)
@@ -755,7 +755,7 @@ gl_FragCoord origin is upper left
0:49 Branch: Return with expression
0:49 Convert float to double (temp 3-component vector of double)
0:49 'f3' (uniform 3-component vector of float)
0:202 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
0:202 Function Definition: main( (global structure{temp 4-component vector of float Color})
0:52 Function Parameters:
0:? Sequence
0:54 Sequence
@@ -1009,15 +1009,15 @@ gl_FragCoord origin is upper left
0:196 Convert int to float (temp float)
0:196 'c2' (temp int)
0:199 move second child to first child (temp 4-component vector of float)
0:199 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:199 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:199 Color: direct index for structure (temp 4-component vector of float)
0:199 'psout' (temp structure{temp 4-component vector of float Color})
0:199 Constant:
0:199 0 (const int)
0:199 'outval' (temp 4-component vector of float)
0:200 Sequence
0:200 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:200 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:200 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:200 'psout' (temp structure{temp 4-component vector of float Color})
0:200 Branch: Return
0:? Linker Objects
0:? 'i3' (uniform 3-component vector of int)
@@ -1129,7 +1129,6 @@ gl_FragCoord origin is upper left
MemberName 471(PS_OUTPUT) 0 "Color"
Name 473 "psout"
Name 477 "@entryPointOutput"
MemberDecorate 471(PS_OUTPUT) 0 Location 0
2: TypeVoid
3: TypeFunction 2
6: TypeFloat 32