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

@@ -2,7 +2,7 @@ hlsl.pp.line.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:131 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:131 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:4 Function Parameters:
0:? Sequence
0:124 Sequence
@@ -11,8 +11,8 @@ gl_FragCoord origin is upper left
0:124 Constant:
0:124 124 (const int)
0:126 move second child to first child (temp 4-component vector of float)
0:126 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:126 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:126 Color: direct index for structure (temp 4-component vector of float)
0:126 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:126 Constant:
0:126 0 (const int)
0:? Construct vec4 (temp 4-component vector of float)
@@ -26,15 +26,15 @@ gl_FragCoord origin is upper left
0:126 1.000000
0:127 move second child to first child (temp float)
0:127 Depth: direct index for structure (temp float FragDepth)
0:127 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:127 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:127 Constant:
0:127 1 (const int)
0:127 Constant:
0:127 1.000000
0:129 Sequence
0:129 move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 Branch: Return
0:? Linker Objects
@@ -45,7 +45,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:131 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:131 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:4 Function Parameters:
0:? Sequence
0:124 Sequence
@@ -54,8 +54,8 @@ gl_FragCoord origin is upper left
0:124 Constant:
0:124 124 (const int)
0:126 move second child to first child (temp 4-component vector of float)
0:126 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:126 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:126 Color: direct index for structure (temp 4-component vector of float)
0:126 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:126 Constant:
0:126 0 (const int)
0:? Construct vec4 (temp 4-component vector of float)
@@ -69,15 +69,15 @@ gl_FragCoord origin is upper left
0:126 1.000000
0:127 move second child to first child (temp float)
0:127 Depth: direct index for structure (temp float FragDepth)
0:127 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:127 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:127 Constant:
0:127 1 (const int)
0:127 Constant:
0:127 1.000000
0:129 Sequence
0:129 move second child to first child (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 move second child to first child (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:? '@entryPointOutput' (out structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:129 Branch: Return
0:? Linker Objects
@@ -97,7 +97,6 @@ gl_FragCoord origin is upper left
MemberName 12(PS_OUTPUT) 1 "Depth"
Name 14 "psout"
Name 27 "@entryPointOutput"
MemberDecorate 12(PS_OUTPUT) 0 Location 0
MemberDecorate 12(PS_OUTPUT) 1 BuiltIn FragDepth
2: TypeVoid
3: TypeFunction 2