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.samplecmp.offsetarray.dx10.frag.out
View File

@@ -2,7 +2,7 @@ hlsl.samplecmp.offsetarray.dx10.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:68 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:68 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:38 Function Parameters:
0:? Sequence
0:42 Sequence
@@ -102,8 +102,8 @@ gl_FragCoord origin is upper left
0:? 2 (const int)
0:? 3 (const int)
0:63 move second child to first child (temp 4-component vector of float)
0:63 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:63 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:63 Color: direct index for structure (temp 4-component vector of float)
0:63 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:63 Constant:
0:63 0 (const int)
0:63 Constant:
@@ -113,15 +113,15 @@ gl_FragCoord origin is upper left
0:63 1.000000
0:64 move second child to first child (temp float)
0:64 Depth: direct index for structure (temp float FragDepth)
0:64 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:64 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:64 Constant:
0:64 1 (const int)
0:64 Constant:
0:64 1.000000
0:66 Sequence
0:66 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:66 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:66 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:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:66 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -154,7 +154,7 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:68 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:68 Function Definition: main( (global structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:38 Function Parameters:
0:? Sequence
0:42 Sequence
@@ -254,8 +254,8 @@ gl_FragCoord origin is upper left
0:? 2 (const int)
0:? 3 (const int)
0:63 move second child to first child (temp 4-component vector of float)
0:63 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:63 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:63 Color: direct index for structure (temp 4-component vector of float)
0:63 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:63 Constant:
0:63 0 (const int)
0:63 Constant:
@@ -265,15 +265,15 @@ gl_FragCoord origin is upper left
0:63 1.000000
0:64 move second child to first child (temp float)
0:64 Depth: direct index for structure (temp float FragDepth)
0:64 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:64 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:64 Constant:
0:64 1 (const int)
0:64 Constant:
0:64 1.000000
0:66 Sequence
0:66 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:66 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color, temp float FragDepth Depth})
0:66 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:66 'psout' (temp structure{temp 4-component vector of float Color, temp float FragDepth Depth})
0:66 Branch: Return
0:? Linker Objects
0:? 'g_sSamp' (layout(binding=0 ) uniform sampler)
@@ -352,7 +352,6 @@ gl_FragCoord origin is upper left
Decorate 58(g_tTex2df4a) DescriptorSet 0
Decorate 76(g_tTex2di4a) DescriptorSet 0
Decorate 88(g_tTex2du4a) DescriptorSet 0
MemberDecorate 98(PS_OUTPUT) 0 Location 0
MemberDecorate 98(PS_OUTPUT) 1 BuiltIn FragDepth
Decorate 114(g_tTex1df4) DescriptorSet 0
Decorate 114(g_tTex1df4) Binding 0