mewin/glslang
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

HLSL: Allow expressions in attributes

Browse Source 
For example:

[numthreads(2+2, 2*3, (1+FOO)*BAR)]

This will result in a thread count (4, 6, 8).
This commit is contained in:
steve-lunarg
2016-11-11 08:17:44 -07:00
parent d3f1122a44
commit a22f7dbb71
4 changed files with 167 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
hlsl/hlslGrammar.cpp
View File

@@ -2453,27 +2453,29 @@ void HlslGrammar::acceptAttributes(TAttributeMap& attributes)
advanceToken();
}
TIntermAggregate* literals = nullptr;
TIntermAggregate* expressions = nullptr;
// (x, ...)
if (acceptTokenClass(EHTokLeftParen)) {
literals = new TIntermAggregate;
expressions = new TIntermAggregate;
TIntermTyped* node;
bool expectingLiteral = false;
bool expectingExpression = false;
while (acceptLiteral(node)) {
expectingLiteral = false;
literals->getSequence().push_back(node);
while (acceptAssignmentExpression(node)) {
expectingExpression = false;
expressions->getSequence().push_back(node);
if (acceptTokenClass(EHTokComma))
expectingLiteral = true;
expectingExpression = true;
}
// 'literals' is an aggregate with the literals in it
// 'expressions' is an aggregate with the expressions in it
if (! acceptTokenClass(EHTokRightParen))
expected(")");
if (expectingLiteral || literals->getSequence().empty())
expected("literal");
// Error for partial or missing expression
if (expectingExpression || expressions->getSequence().empty())
expected("expression");
}
// RIGHT_BRACKET
@@ -2484,7 +2486,7 @@ void HlslGrammar::acceptAttributes(TAttributeMap& attributes)
// Add any values we found into the attribute map. This accepts
// (and ignores) values not mapping to a known TAttributeType;
attributes.setAttribute(idToken.string, literals);
attributes.setAttribute(idToken.string, expressions);
} while (true);
}