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

Comment out params instead of removing

Browse Source
This commit is contained in:
Dan Sinclair 2019-09-11 08:58:48 -04:00
parent 24a5d23d5a
commit 23e9f5ca74
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
glslang/MachineIndependent/Initialize.cpp
View File

@ -357,7 +357,7 @@ void AddTabledBuiltin(TString& decls, const BuiltInFunction& function)
} }
// See if the tabled versioning information allows the current version. // See if the tabled versioning information allows the current version.
bool ValidVersion(const BuiltInFunction& function, int version, EProfile profile) bool ValidVersion(const BuiltInFunction& function, int version, EProfile profile, const SpvVersion& /* spVersion */)
{ {
#ifdef GLSLANG_WEB #ifdef GLSLANG_WEB
// all entries in table are valid // all entries in table are valid
@ -395,11 +395,11 @@ void RelateTabledBuiltins(const BuiltInFunction* functions, TSymbolTable& symbol
} // end anonymous namespace } // end anonymous namespace
// Add declarations for all tables of built-in functions. // Add declarations for all tables of built-in functions.
void TBuiltIns::addTabledBuiltins(int version, EProfile profile) void TBuiltIns::addTabledBuiltins(int version, EProfile profile, const SpvVersion& spvVersion)
{ {
const auto forEachFunction = [&](TString& decls, const BuiltInFunction* function) { const auto forEachFunction = [&](TString& decls, const BuiltInFunction* function) {
while (function->op != EOpNull) { while (function->op != EOpNull) {
if (ValidVersion(*function, version, profile)) if (ValidVersion(*function, version, profile, spvVersion))
AddTabledBuiltin(decls, *function); AddTabledBuiltin(decls, *function);
++function; ++function;
} }
@ -417,7 +417,7 @@ void TBuiltIns::addTabledBuiltins(int version, EProfile profile)
} }
// Relate all tables of built-ins to the AST operators. // Relate all tables of built-ins to the AST operators.
void TBuiltIns::relateTabledBuiltins(TSymbolTable& symbolTable) void TBuiltIns::relateTabledBuiltins(int /* version */, EProfile /* profile */, const SpvVersion& /* spvVersion */, EShLanguage /* stage */, TSymbolTable& symbolTable)
{ {
RelateTabledBuiltins(BaseFunctions, symbolTable); RelateTabledBuiltins(BaseFunctions, symbolTable);
RelateTabledBuiltins(DerivativeFunctions, symbolTable); RelateTabledBuiltins(DerivativeFunctions, symbolTable);
@ -484,7 +484,7 @@ TBuiltIns::~TBuiltIns()
// //
void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvVersion) void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvVersion)
{ {
addTabledBuiltins(version, profile); addTabledBuiltins(version, profile, spvVersion);
//============================================================================ //============================================================================
// //
@ -8956,7 +8956,7 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
// operations. // operations.
// //
relateTabledBuiltins(symbolTable); relateTabledBuiltins(version, profile, spvVersion, language, symbolTable);
symbolTable.relateToOperator("matrixCompMult", EOpMul); symbolTable.relateToOperator("matrixCompMult", EOpMul);
// 120 and 150 are correct for both ES and desktop // 120 and 150 are correct for both ES and desktop

4
glslang/MachineIndependent/Initialize.h
View File

@ -91,8 +91,8 @@ public:
void identifyBuiltIns(int version, EProfile profile, const SpvVersion& spvVersion, EShLanguage language, TSymbolTable& symbolTable, const TBuiltInResource &resources); void identifyBuiltIns(int version, EProfile profile, const SpvVersion& spvVersion, EShLanguage language, TSymbolTable& symbolTable, const TBuiltInResource &resources);
protected: protected:
void addTabledBuiltins(int version, EProfile profile); void addTabledBuiltins(int version, EProfile profile, const SpvVersion& spvVersion);
void relateTabledBuiltins(TSymbolTable&); void relateTabledBuiltins(int version, EProfile profile, const SpvVersion& spvVersion, EShLanguage, TSymbolTable&);
void add2ndGenerationSamplingImaging(int version, EProfile profile, const SpvVersion& spvVersion); void add2ndGenerationSamplingImaging(int version, EProfile profile, const SpvVersion& spvVersion);
void addSubpassSampling(TSampler, const TString& typeName, int version, EProfile profile); void addSubpassSampling(TSampler, const TString& typeName, int version, EProfile profile);
void addQueryFunctions(TSampler, const TString& typeName, int version, EProfile profile); void addQueryFunctions(TSampler, const TString& typeName, int version, EProfile profile);