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

HLSL: Start location numbering with the entry-point return value.

Browse Source 
Also, increment location numbers by the size of the objects.
This commit is contained in:
John Kessenich
2016-08-29 18:10:47 -06:00
parent a05d8b5604
commit 830b0cc98b
89 changed files with 2517 additions and 2157 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
hlsl/hlslParseHelper.cpp
View File

@@ -754,28 +754,8 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l
functionReturnsValue = false;
inEntrypoint = (function.getName() == intermediate.getEntryPoint().c_str());
if (inEntrypoint) {
// parameters are actually shader-scoped inputs and outputs (in or out)
unsigned int inCount = 0;
unsigned int outCount = 0;
for (int i = 0; i < function.getParamCount(); i++) {
if (function[i].type->getQualifier().isParamInput()) {
if (function[i].type->getQualifier().builtIn == EbvNone)
function[i].type->getQualifier().layoutLocation = inCount++;
function[i].type->getQualifier().storage = EvqVaryingIn;
} else {
if (function[i].type->getQualifier().builtIn == EbvNone && language != EShLangFragment)
function[i].type->getQualifier().layoutLocation = outCount++;
function[i].type->getQualifier().storage = EvqVaryingOut;
}
}
// return value is actually shader-scoped output (out)
if (function.getType().getBasicType() != EbtVoid) {
entryPointOutput = makeInternalVariable("@entryPointOutput", function.getType());
entryPointOutput->getWritableType().getQualifier().storage = EvqVaryingOut;
}
}
if (inEntrypoint)
remapEntrypointIO(function);
//
// New symbol table scope for body of function plus its arguments
@@ -819,6 +799,43 @@ TIntermAggregate* HlslParseContext::handleFunctionDefinition(const TSourceLoc& l
return paramNodes;
}
// AST I/O is done through shader globals declared in the 'in' or 'out'
// storage class. An HLSL entry point has a return value, input parameters
// and output parameters. These need to get remapped to the AST I/O.
void HlslParseContext::remapEntrypointIO(TFunction& function)
{
// Will auto-assign locations here to the inputs/outputs defined by the entry point
unsigned int inCount = 0;
unsigned int outCount = 0;
// return value is actually a shader-scoped output (out)
if (function.getType().getBasicType() != EbtVoid) {
entryPointOutput = makeInternalVariable("@entryPointOutput", function.getType());
entryPointOutput->getWritableType().getQualifier().storage = EvqVaryingOut;
if (function.getType().getQualifier().builtIn == EbvNone) {
entryPointOutput->getWritableType().getQualifier().layoutLocation = outCount;
outCount += intermediate.computeTypeLocationSize(function.getType());
}
}
// parameters are actually shader-scoped inputs and outputs (in or out)
for (int i = 0; i < function.getParamCount(); i++) {
if (function[i].type->getQualifier().isParamInput()) {
function[i].type->getQualifier().storage = EvqVaryingIn;
if (function[i].type->getQualifier().builtIn == EbvNone) {
function[i].type->getQualifier().layoutLocation = inCount;
inCount += intermediate.computeTypeLocationSize(*function[i].type);
}
} else {
function[i].type->getQualifier().storage = EvqVaryingOut;
if (function[i].type->getQualifier().builtIn == EbvNone && language != EShLangFragment) {
function[i].type->getQualifier().layoutLocation = outCount;
outCount += intermediate.computeTypeLocationSize(*function[i].type);
}
}
}
}
// Handle function returns, including type conversions to the function return type
// if necessary.
TIntermNode* HlslParseContext::handleReturnValue(const TSourceLoc& loc, TIntermTyped* value)

1
hlsl/hlslParseHelper.h
View File

@@ -85,6 +85,7 @@ public:
TIntermTyped* handleDotDereference(const TSourceLoc&, TIntermTyped* base, const TString& field);
TFunction* handleFunctionDeclarator(const TSourceLoc&, TFunction& function, bool prototype);
TIntermAggregate* handleFunctionDefinition(const TSourceLoc&, TFunction&);
void remapEntrypointIO(TFunction& function);
TIntermNode* handleReturnValue(const TSourceLoc&, TIntermTyped*);
void handleFunctionArgument(TFunction*, TIntermTyped*& arguments, TIntermTyped* newArg);
TIntermTyped* handleFunctionCall(const TSourceLoc&, TFunction*, TIntermNode*);