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

@@ -2,12 +2,12 @@ hlsl.stringtoken.frag
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:21 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
0:21 Function Definition: main( (global structure{temp 4-component vector of float Color})
0:16 Function Parameters:
0:? Sequence
0:18 move second child to first child (temp 4-component vector of float)
0:18 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:18 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:18 Color: direct index for structure (temp 4-component vector of float)
0:18 'psout' (temp structure{temp 4-component vector of float Color})
0:18 Constant:
0:18 0 (const int)
0:? Constant:
@@ -16,9 +16,9 @@ gl_FragCoord origin is upper left
0:? 0.000000
0:? 1.000000
0:19 Sequence
0:19 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:19 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:19 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:19 'psout' (temp structure{temp 4-component vector of float Color})
0:19 Branch: Return
0:? Linker Objects
0:? 'TestTexture' (uniform texture2D)
@@ -31,12 +31,12 @@ Linked fragment stage:
Shader version: 450
gl_FragCoord origin is upper left
0:? Sequence
0:21 Function Definition: main( (global structure{layout(location=0 ) temp 4-component vector of float Color})
0:21 Function Definition: main( (global structure{temp 4-component vector of float Color})
0:16 Function Parameters:
0:? Sequence
0:18 move second child to first child (temp 4-component vector of float)
0:18 Color: direct index for structure (layout(location=0 ) temp 4-component vector of float)
0:18 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:18 Color: direct index for structure (temp 4-component vector of float)
0:18 'psout' (temp structure{temp 4-component vector of float Color})
0:18 Constant:
0:18 0 (const int)
0:? Constant:
@@ -45,9 +45,9 @@ gl_FragCoord origin is upper left
0:? 0.000000
0:? 1.000000
0:19 Sequence
0:19 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:19 'psout' (temp structure{layout(location=0 ) temp 4-component vector of float Color})
0:19 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:19 'psout' (temp structure{temp 4-component vector of float Color})
0:19 Branch: Return
0:? Linker Objects
0:? 'TestTexture' (uniform texture2D)
@@ -69,7 +69,6 @@ gl_FragCoord origin is upper left
Name 19 "@entryPointOutput"
Name 24 "TestTexture"
Name 26 "TestUF"
MemberDecorate 8(PS_OUTPUT) 0 Location 0
Decorate 24(TestTexture) DescriptorSet 0
2: TypeVoid
3: TypeFunction 2