HLSL: Make attributes for built-in override semantics.

Fixes #1188.
2017-12-15 08:15:26 -07:00 · 2017-12-15 08:15:26 -07:00 · 788fbeb36f
commit 788fbeb36f
parent a67d0706da
2 changed files with 3 additions and 2 deletions
--- a/Test/hlsl.PointSize.geom
+++ b/Test/hlsl.PointSize.geom
@ -1,5 +1,5 @@
 struct S {
-    [[vk::builtin("PointSize")]] float ps;
+    [[vk::builtin("PointSize")]] float ps : PSIZE;
 };

 [maxvertexcount(4)]
--- a/hlsl/hlslParseHelper.cpp
+++ b/hlsl/hlslParseHelper.cpp
@ -5856,7 +5856,8 @@ void HlslParseContext::handleSemantic(TSourceLoc loc, TQualifier& qualifier, TBu
        break;
    }

-    qualifier.builtIn = builtIn;
+    if (qualifier.builtIn == EbvNone)
+        qualifier.builtIn = builtIn;
    qualifier.semanticName = intermediate.addSemanticName(upperCase);
 }