commit 34e7ee79bb8e9a7ef2f35ed30308fb4f1a297368
author John Kessenich <cepheus@frii.com> Fri Sep 16 17:10:39 2016 -0600
committer John Kessenich <cepheus@frii.com> Fri Sep 16 18:05:44 2016 -0600
tree 6f0c1680defe756d4e55eea724c0a5a2851f3195
parent d21baed6bc40fef66b616d09f6fb07669d313a31

HLSL: Improve setting and testing of interpolation qualifiers.

Notably, use of 'linear' on a non-input could mark it as an input.

hlsl/hlslGrammar.cpp

diff --git a/hlsl/hlslGrammar.cpp b/hlsl/hlslGrammar.cpp
index d0ff3cd..cc7e901 100755
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -435,7 +435,7 @@
         return false;
     if (type.getBasicType() == EbtBlock) {
         // the type was a block, which set some parts of the qualifier
-        parseContext.mergeQualifiers(loc, type.getQualifier(), qualifier, true);
+        parseContext.mergeQualifiers(type.getQualifier(), qualifier);
         // further, it can create an anonymous instance of the block
         if (peekTokenClass(EHTokSemicolon))
             parseContext.declareBlock(loc, type);
@@ -476,7 +476,6 @@
             qualifier.volatil = true;
             break;
         case EHTokLinear:
-            qualifier.storage = EvqVaryingIn;
             qualifier.smooth = true;
             break;
         case EHTokCentroid: