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.load.2dms.dx10.frag.out
View File

@@ -2,7 +2,7 @@ hlsl.load.2dms.dx10.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:57 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:57 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:28 Function Parameters:
0:? Sequence
0:32 textureFetch (global 4-component vector of float)
@@ -72,8 +72,8 @@ gl_FragCoord origin is upper left
0:49 3 (const int)
0:49 'o2' (uniform 2-component vector of int)
0:51 move second child to first child (temp 4-component vector of float)
0:51 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:51 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Color: direct index for structure (temp 4-component vector of float)
0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Constant:
0:51 0 (const int)
0:51 Constant:
@@ -83,15 +83,15 @@ gl_FragCoord origin is upper left
0:51 1.000000
0:52 move second child to first child (temp float)
0:52 Depth: direct index for structure (temp float FragDepth)
0:52 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:52 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:52 Constant:
0:52 1 (const int)
0:52 Constant:
0:52 1.000000
0:54 Sequence
0:54 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:54 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:54 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:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:54 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -117,7 +117,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:57 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:57 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:28 Function Parameters:
0:? Sequence
0:32 textureFetch (global 4-component vector of float)
@@ -187,8 +187,8 @@ gl_FragCoord origin is upper left
0:49 3 (const int)
0:49 'o2' (uniform 2-component vector of int)
0:51 move second child to first child (temp 4-component vector of float)
0:51 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:51 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Color: direct index for structure (temp 4-component vector of float)
0:51 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:51 Constant:
0:51 0 (const int)
0:51 Constant:
@@ -198,15 +198,15 @@ gl_FragCoord origin is upper left
0:51 1.000000
0:52 move second child to first child (temp float)
0:52 Depth: direct index for structure (temp float FragDepth)
0:52 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:52 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:52 Constant:
0:52 1 (const int)
0:52 Constant:
0:52 1.000000
0:54 Sequence
0:54 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:54 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:54 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:54 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:54 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -263,7 +263,6 @@ gl_FragCoord origin is upper left
Decorate 49(g_tTex2dmsf4a) DescriptorSet 0
Decorate 58(g_tTex2dmsi4a) DescriptorSet 0
Decorate 64(g_tTex2dmsu4a) DescriptorSet 0
MemberDecorate 80(PS_OUTPUT) 0 Location 0
MemberDecorate 80(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 97(g_sSamp) DescriptorSet 0
Decorate 97(g_sSamp) Binding 0