Merge pull request #385 from steve-lunarg/inout-qualifiers
HLSL: add in/out/inout qualifiers
This commit is contained in:
@@ -478,6 +478,15 @@ void HlslGrammar::acceptQualifier(TQualifier& qualifier)
|
||||
case EHTokPrecise:
|
||||
qualifier.noContraction = true;
|
||||
break;
|
||||
case EHTokIn:
|
||||
qualifier.storage = EvqIn;
|
||||
break;
|
||||
case EHTokOut:
|
||||
qualifier.storage = EvqOut;
|
||||
break;
|
||||
case EHTokInOut:
|
||||
qualifier.storage = EvqInOut;
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -114,6 +114,9 @@ void HlslScanContext::fillInKeywordMap()
|
||||
(*KeywordMap)["row_major"] = EHTokRowMajor;
|
||||
(*KeywordMap)["column_major"] = EHTokColumnMajor;
|
||||
(*KeywordMap)["packoffset"] = EHTokPackOffset;
|
||||
(*KeywordMap)["in"] = EHTokIn;
|
||||
(*KeywordMap)["out"] = EHTokOut;
|
||||
(*KeywordMap)["inout"] = EHTokInOut;
|
||||
|
||||
(*KeywordMap)["Buffer"] = EHTokBuffer;
|
||||
(*KeywordMap)["vector"] = EHTokVector;
|
||||
@@ -449,6 +452,9 @@ EHlslTokenClass HlslScanContext::tokenizeIdentifier()
|
||||
case EHTokRowMajor:
|
||||
case EHTokColumnMajor:
|
||||
case EHTokPackOffset:
|
||||
case EHTokIn:
|
||||
case EHTokOut:
|
||||
case EHTokInOut:
|
||||
return keyword;
|
||||
|
||||
// template types
|
||||
|
||||
@@ -61,6 +61,9 @@ enum EHlslTokenClass {
|
||||
EHTokRowMajor,
|
||||
EHTokColumnMajor,
|
||||
EHTokPackOffset,
|
||||
EHTokIn,
|
||||
EHTokOut,
|
||||
EHTokInOut,
|
||||
|
||||
// template types
|
||||
EHTokBuffer,
|
||||
|
||||
Reference in New Issue
Block a user