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

Non-functional: Use isOpaque() instead of compare against EbtSampler.

Browse Source
This commit is contained in:
John Kessenich 2016-10-01 12:35:01 -06:00
parent 47e6fa1cad
commit f571d0c037
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glslang/Include/revision.h
View File

@ -2,5 +2,5 @@
// For the version, it uses the latest git tag followed by the number of commits. // For the version, it uses the latest git tag followed by the number of commits.
// For the date, it uses the current date (when then script is run). // For the date, it uses the current date (when then script is run).
#define GLSLANG_REVISION "Overload400-PrecQual.1528" #define GLSLANG_REVISION "Overload400-PrecQual.1541"
#define GLSLANG_DATE "29-Sep-2016" #define GLSLANG_DATE "01-Oct-2016"

2
hlsl/hlslGrammar.cpp
View File

@ -366,7 +366,7 @@ bool HlslGrammar::acceptDeclaration(TIntermNode*& node)
else if (variableType.getBasicType() == EbtBlock) else if (variableType.getBasicType() == EbtBlock)
parseContext.declareBlock(idToken.loc, variableType, idToken.string); parseContext.declareBlock(idToken.loc, variableType, idToken.string);
else { else {
if (variableType.getQualifier().storage == EvqUniform && variableType.getBasicType() != EbtSampler) { if (variableType.getQualifier().storage == EvqUniform && ! variableType.isOpaque()) {
// this isn't really an individual variable, but a member of the $Global buffer // this isn't really an individual variable, but a member of the $Global buffer
parseContext.growGlobalUniformBlock(idToken.loc, variableType, *idToken.string); parseContext.growGlobalUniformBlock(idToken.loc, variableType, *idToken.string);
} else { } else {

3
hlsl/hlslParseHelper.cpp
View File

@ -737,8 +737,7 @@ bool HlslParseContext::shouldFlattenUniform(const TType& type) const
return type.isArray() && return type.isArray() &&
intermediate.getFlattenUniformArrays() && intermediate.getFlattenUniformArrays() &&
qualifier == EvqUniform && qualifier == EvqUniform &&
// Testing the EbtSampler basic type covers samplers and textures type.isOpaque();
type.getBasicType() == EbtSampler;
} }
void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable) void HlslParseContext::flatten(const TSourceLoc& loc, const TVariable& variable)