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

HLSL: Handle greater/less depth modes. Fixes issue #489.

Browse Source
This commit is contained in:
John Kessenich
2016-09-02 20:05:19 -06:00
parent a305166ea4
commit 9e079535a0
9 changed files with 158 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
hlsl/hlslGrammar.cpp
View File

@@ -302,10 +302,10 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
HlslToken idToken;
while (acceptIdentifier(idToken)) {
// function_parameters
TFunction* function = new TFunction(idToken.string, type);
if (acceptFunctionParameters(*function)) {
TFunction& function = *new TFunction(idToken.string, type);
if (acceptFunctionParameters(function)) {
// post_decls
acceptPostDecls(type);
acceptPostDecls(function.getWritableType());
// compound_statement (function body definition) or just a prototype?
if (peekTokenClass(EHTokLeftBrace)) {
@@ -313,11 +313,11 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
parseContext.error(idToken.loc, "function body can't be in a declarator list", "{", "");
if (typedefDecl)
parseContext.error(idToken.loc, "function body can't be in a typedef", "{", "");
return acceptFunctionDefinition(*function, node);
return acceptFunctionDefinition(function, node);
} else {
if (typedefDecl)
parseContext.error(idToken.loc, "function typedefs not implemented", "{", "");
parseContext.handleFunctionDeclarator(idToken.loc, *function, true);
parseContext.handleFunctionDeclarator(idToken.loc, function, true);
}
} else {
// a variable declaration

29
hlsl/hlslParseHelper.cpp
View File

@@ -819,6 +819,21 @@ void HlslParseContext::remapEntrypointIO(TFunction& function)
unsigned int inCount = 0;
unsigned int outCount = 0;
const auto remapBuiltInType = [&](TType& type) {
switch (type.getQualifier().builtIn) {
case EbvFragDepthGreater:
intermediate.setDepth(EldGreater);
type.getQualifier().builtIn = EbvFragDepth;
break;
case EbvFragDepthLesser:
intermediate.setDepth(EldLess);
type.getQualifier().builtIn = EbvFragDepth;
break;
default:
break;
}
};
// return value is actually a shader-scoped output (out)
if (function.getType().getBasicType() != EbtVoid) {
entryPointOutput = makeInternalVariable("@entryPointOutput", function.getType());
@@ -827,6 +842,7 @@ void HlslParseContext::remapEntrypointIO(TFunction& function)
entryPointOutput->getWritableType().getQualifier().layoutLocation = outCount;
outCount += intermediate.computeTypeLocationSize(function.getType());
}
remapBuiltInType(function.getWritableType());
}
// parameters are actually shader-scoped inputs and outputs (in or out)
@@ -844,6 +860,7 @@ void HlslParseContext::remapEntrypointIO(TFunction& function)
outCount += intermediate.computeTypeLocationSize(*function[i].type);
}
}
remapBuiltInType(*function[i].type);
}
}
@@ -2423,13 +2440,11 @@ void HlslParseContext::handleSemantic(TSourceLoc loc, TType& type, const TString
type.getQualifier().builtIn = EbvFragDepth;
//TODO, these need to get refined to be more specific
else if( semanticUpperCase == "SV_DEPTHGREATEREQUAL") {
type.getQualifier().builtIn = EbvFragDepth;
warn(loc, "depth mode unimplemented", "SV_DEPTHGREATEREQUAL", "");
} else if( semanticUpperCase == "SV_DEPTHLESSEQUAL") {
type.getQualifier().builtIn = EbvFragDepth;
warn(loc, "depth mode unimplemented", "SV_DEPTHLESSEQUAL", "");
} else if( semanticUpperCase == "SV_STENCILREF")
else if( semanticUpperCase == "SV_DEPTHGREATEREQUAL")
type.getQualifier().builtIn = EbvFragDepthGreater;
else if( semanticUpperCase == "SV_DEPTHLESSEQUAL")
type.getQualifier().builtIn = EbvFragDepthLesser;
else if( semanticUpperCase == "SV_STENCILREF")
error(loc, "unimplemented", "SV_STENCILREF", "");
else if( semanticUpperCase == "SV_COVERAGE")
error(loc, "unimplemented", "SV_COVERAGE", "");