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

28
Test/baseResults/hlsl.getsampleposition.dx10.frag.out
View File

@@ -7,7 +7,7 @@ ERROR: 2 compilation errors. No code generated.
Shader version: 450
gl_FragCoord origin is upper left
ERROR: node is still EOpNull!
0:24 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:24 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:13 Function Parameters:
0:? Sequence
0:16 Sequence
@@ -27,8 +27,8 @@ ERROR: node is still EOpNull!
0:17 Constant:
0:17 2 (const int)
0:19 move second child to first child (temp 4-component vector of float)
0:19 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:19 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:19 Color: direct index for structure (temp 4-component vector of float)
0:19 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:19 Constant:
0:19 0 (const int)
0:19 Constant:
@@ -38,15 +38,15 @@ ERROR: node is still EOpNull!
0:19 1.000000
0:20 move second child to first child (temp float)
0:20 Depth: direct index for structure (temp float FragDepth)
0:20 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:20 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:20 Constant:
0:20 1 (const int)
0:20 Constant:
0:20 1.000000
0:22 Sequence
0:22 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:22 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:22 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:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:22 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -60,7 +60,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
ERROR: node is still EOpNull!
0:24 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:24 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:13 Function Parameters:
0:? Sequence
0:16 Sequence
@@ -80,8 +80,8 @@ ERROR: node is still EOpNull!
0:17 Constant:
0:17 2 (const int)
0:19 move second child to first child (temp 4-component vector of float)
0:19 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:19 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:19 Color: direct index for structure (temp 4-component vector of float)
0:19 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:19 Constant:
0:19 0 (const int)
0:19 Constant:
@@ -91,15 +91,15 @@ ERROR: node is still EOpNull!
0:19 1.000000
0:20 move second child to first child (temp float)
0:20 Depth: direct index for structure (temp float FragDepth)
0:20 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:20 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:20 Constant:
0:20 1 (const int)
0:20 Constant:
0:20 1.000000
0:22 Sequence
0:22 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:22 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:22 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:22 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:22 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)