BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unused params

Browse source
This commit is contained in:
Dan Sinclair 2019-09-10 15:39:22 -04:00
parent 664ad418f8
commit 24a5d23d5a
2 changed files with 15 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

27
glslang/MachineIndependent/Initialize.cpp
View file

@ -152,12 +152,12 @@ EProfile EDesktopProfile = static_cast<EProfile>(ENoProfile | ECoreProfile | ECo
{ EDesktopProfile, 0, 130, 0, nullptr }, { EDesktopProfile, 0, 130, 0, nullptr },
{ EBadProfile } }; { EBadProfile } };
const Versioning* Es300Desktop130 = &Es300Desktop130Version[0]; const Versioning* Es300Desktop130 = &Es300Desktop130Version[0];
const Versioning Es310Desktop430Version[] = { { EEsProfile, 0, 310, 0, nullptr }, const Versioning Es310Desktop430Version[] = { { EEsProfile, 0, 310, 0, nullptr },
{ EDesktopProfile, 0, 430, 0, nullptr }, { EDesktopProfile, 0, 430, 0, nullptr },
{ EBadProfile } }; { EBadProfile } };
const Versioning* Es310Desktop430 = &Es310Desktop430Version[0]; const Versioning* Es310Desktop430 = &Es310Desktop430Version[0];
const Versioning Es310Desktop450Version[] = { { EEsProfile, 0, 310, 0, nullptr }, const Versioning Es310Desktop450Version[] = { { EEsProfile, 0, 310, 0, nullptr },
{ EDesktopProfile, 0, 450, 0, nullptr }, { EDesktopProfile, 0, 450, 0, nullptr },
{ EBadProfile } }; { EBadProfile } };
@ -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, const SpvVersion& spvVersion) bool ValidVersion(const BuiltInFunction& function, int version, EProfile profile)
{ {
#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, const SpvVersion& spvVersion) void TBuiltIns::addTabledBuiltins(int version, EProfile profile)
{ {
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, spvVersion)) if (ValidVersion(*function, version, profile))
AddTabledBuiltin(decls, *function); AddTabledBuiltin(decls, *function);
++function; ++function;
} }
@ -417,8 +417,7 @@ void TBuiltIns::addTabledBuiltins(int version, EProfile profile, const SpvVersio
} }
// Relate all tables of built-ins to the AST operators. // Relate all tables of built-ins to the AST operators.
void TBuiltIns::relateTabledBuiltins(int version, EProfile profile, const SpvVersion& spvVersion, EShLanguage stage, void TBuiltIns::relateTabledBuiltins(TSymbolTable& symbolTable)
TSymbolTable& symbolTable)
{ {
RelateTabledBuiltins(BaseFunctions, symbolTable); RelateTabledBuiltins(BaseFunctions, symbolTable);
RelateTabledBuiltins(DerivativeFunctions, symbolTable); RelateTabledBuiltins(DerivativeFunctions, symbolTable);
@ -485,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, spvVersion); addTabledBuiltins(version, profile);
//============================================================================ //============================================================================
// //
@ -3721,7 +3720,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
"\n"); "\n");
} }
if ((profile != EEsProfile && version >= 450) || if ((profile != EEsProfile && version >= 450) ||
(profile == EEsProfile && version >= 320)) { (profile == EEsProfile && version >= 320)) {
commonBuiltins.append( commonBuiltins.append(
"struct gl_TextureFootprint2DNV {" "struct gl_TextureFootprint2DNV {"
@ -5047,7 +5046,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 320)) { if ((profile != EEsProfile && version >= 450) || (profile == EEsProfile && version >= 320)) {
stageBuiltins[EShLangMeshNV].append( stageBuiltins[EShLangMeshNV].append(
"void writePackedPrimitiveIndices4x8NV(uint, uint);" "void writePackedPrimitiveIndices4x8NV(uint, uint);"
"\n"); "\n");
} }
#endif #endif
@ -5986,7 +5985,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
// GL_ARB_shader_ballot // GL_ARB_shader_ballot
if (profile != EEsProfile && version >= 450) { if (profile != EEsProfile && version >= 450) {
const char* ballotDecls = const char* ballotDecls =
"uniform uint gl_SubGroupSizeARB;" "uniform uint gl_SubGroupSizeARB;"
"in uint gl_SubGroupInvocationARB;" "in uint gl_SubGroupInvocationARB;"
"in uint64_t gl_SubGroupEqMaskARB;" "in uint64_t gl_SubGroupEqMaskARB;"
@ -5995,7 +5994,7 @@ void TBuiltIns::initialize(int version, EProfile profile, const SpvVersion& spvV
"in uint64_t gl_SubGroupLeMaskARB;" "in uint64_t gl_SubGroupLeMaskARB;"
"in uint64_t gl_SubGroupLtMaskARB;" "in uint64_t gl_SubGroupLtMaskARB;"
"\n"; "\n";
const char* fragmentBallotDecls = const char* fragmentBallotDecls =
"uniform uint gl_SubGroupSizeARB;" "uniform uint gl_SubGroupSizeARB;"
"flat in uint gl_SubGroupInvocationARB;" "flat in uint gl_SubGroupInvocationARB;"
"flat in uint64_t gl_SubGroupEqMaskARB;" "flat in uint64_t gl_SubGroupEqMaskARB;"
@ -6287,7 +6286,7 @@ void TBuiltIns::add2ndGenerationSamplingImaging(int version, EProfile profile, c
continue; continue;
// Loop over the bTypes // Loop over the bTypes
for (int bType = 0; bType < sizeof(bTypes)/sizeof(TBasicType); ++bType) { for (size_t bType = 0; bType < sizeof(bTypes)/sizeof(TBasicType); ++bType) {
#ifndef GLSLANG_WEB #ifndef GLSLANG_WEB
if (bTypes[bType] == EbtFloat16 && (profile == EEsProfile || version < 450)) if (bTypes[bType] == EbtFloat16 && (profile == EEsProfile || version < 450))
continue; continue;
@ -8957,7 +8956,7 @@ void TBuiltIns::identifyBuiltIns(int version, EProfile profile, const SpvVersion
// operations. // operations.
// //
relateTabledBuiltins(version, profile, spvVersion, language, symbolTable); relateTabledBuiltins(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, const SpvVersion& spvVersion); void addTabledBuiltins(int version, EProfile profile);
void relateTabledBuiltins(int version, EProfile profile, const SpvVersion& spvVersion, EShLanguage, TSymbolTable&); void relateTabledBuiltins(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);