Merge pull request #943 from xxxbxxx/for-upstream-1

hlsl: "in out" is also an inout qualifier.
2017-06-20 08:59:50 -06:00
parent 54596ff99e b1d97537e8
commit fba125a988
3 changed files with 262 additions and 230 deletions
--- a/hlsl/hlslGrammar.cpp
+++ b/hlsl/hlslGrammar.cpp
@@ -680,10 +680,10 @@ bool HlslGrammar::acceptQualifier(TQualifier& qualifier)
            qualifier.noContraction = true;
            break;
        case EHTokIn:
-            qualifier.storage = EvqIn;
+            qualifier.storage = (qualifier.storage == EvqOut) ? EvqInOut : EvqIn;
            break;
        case EHTokOut:
-            qualifier.storage = EvqOut;
+            qualifier.storage = (qualifier.storage == EvqIn) ? EvqInOut : EvqOut;
            break;
        case EHTokInOut:
            qualifier.storage = EvqInOut;