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

HLSL: Hook up constructor expressions through the AST.

Browse Source
This commit is contained in:
John Kessenich
2016-03-13 11:24:20 -06:00
parent 87142c71fb
commit d016be19fb
7 changed files with 139 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
hlsl/hlslParseHelper.cpp
View File

@@ -754,6 +754,14 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l
return paramNodes;
}
void HlslParseContext::handleFunctionArgument(TFunction* function, TIntermAggregate*& arguments, TIntermTyped* arg)
{
TParameter param = { 0, new TType };
param.type->shallowCopy(arg->getType());
function->addParameter(param);
arguments = intermediate.growAggregate(arguments, arg);
}
//
// Handle seeing function call syntax in the grammar, which could be any of
// - .length() method
@@ -1182,18 +1190,13 @@ void HlslParseContext::builtInOpCheck(const TSourceLoc& loc, const TFunction& fn
//
// Handle seeing a built-in constructor in a grammar production.
//
TFunction* HlslParseContext::handleConstructorCall(const TSourceLoc& loc, const TPublicType& publicType)
TFunction* HlslParseContext::handleConstructorCall(const TSourceLoc& loc, const TType& type)
{
TType type(publicType);
type.getQualifier().precision = EpqNone;
TOperator op = mapTypeToConstructorOp(type);
if (op == EOpNull) {
error(loc, "cannot construct this type", type.getBasicString(), "");
op = EOpConstructFloat;
TType errorType(EbtFloat);
type.shallowCopy(errorType);
return nullptr;
}
TString empty("");