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

Non-functional: Remove use of the unused structure 'remapper', and other minor internal improvements. Triggered by some bigger changes in the works. Also, turned on an existing test that was not included in the test list.

Browse source 
git-svn-id: https://cvs.khronos.org/svn/repos/ogl/trunk/ecosystem/public/sdk/tools/glslang@23426 e7fa87d3-cd2b-0410-9028-fcbf551c1848
This commit is contained in:
John Kessenich 2013-10-09 00:20:26 +00:00
parent 7ea2f9c39f
commit 3afe67dcc2
8 changed files with 86 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

27
glslang/MachineIndependent/SymbolTable.cpp
View file

@ -226,9 +226,9 @@ TSymbol::TSymbol(const TSymbol& copyOf)
writable = true;
}
TVariable::TVariable(const TVariable& copyOf, TStructureMap& remapper) : TSymbol(copyOf)
TVariable::TVariable(const TVariable& copyOf) : TSymbol(copyOf)
{
type.deepCopy(copyOf.type, remapper);
type.deepCopy(copyOf.type);
userType = copyOf.userType;
if (! copyOf.unionArray.empty()) {
@ -240,35 +240,35 @@ TVariable::TVariable(const TVariable& copyOf, TStructureMap& remapper) : TSymbol
}
}
TVariable* TVariable::clone(TStructureMap& remapper)
TVariable* TVariable::clone()
{
TVariable *variable = new TVariable(*this, remapper);
TVariable *variable = new TVariable(*this);
return variable;
}
TFunction::TFunction(const TFunction& copyOf, const TStructureMap& remapper) : TSymbol(copyOf)
TFunction::TFunction(const TFunction& copyOf) : TSymbol(copyOf)
{
for (unsigned int i = 0; i < copyOf.parameters.size(); ++i) {
TParameter param;
parameters.push_back(param);
parameters.back().copyParam(copyOf.parameters[i], remapper);
parameters.back().copyParam(copyOf.parameters[i]);
}
returnType.deepCopy(copyOf.returnType, remapper);
returnType.deepCopy(copyOf.returnType);
mangledName = copyOf.mangledName;
op = copyOf.op;
defined = copyOf.defined;
}
TFunction* TFunction::clone(TStructureMap& remapper)
TFunction* TFunction::clone()
{
TFunction *function = new TFunction(*this, remapper);
TFunction *function = new TFunction(*this);
return function;
}
TAnonMember* TAnonMember::clone(TStructureMap& remapper)
TAnonMember* TAnonMember::clone()
{
// need to implement this once built-in symbols include interface blocks
assert(0);
@ -276,13 +276,13 @@ TAnonMember* TAnonMember::clone(TStructureMap& remapper)
return 0;
}
TSymbolTableLevel* TSymbolTableLevel::clone(TStructureMap& remapper)
TSymbolTableLevel* TSymbolTableLevel::clone()
{
TSymbolTableLevel *symTableLevel = new TSymbolTableLevel();
symTableLevel->anonId = anonId;
tLevel::iterator iter;
for (iter = level.begin(); iter != level.end(); ++iter)
symTableLevel->insert(*iter->second->clone(remapper));
symTableLevel->insert(*iter->second->clone());
return symTableLevel;
}
@ -291,11 +291,10 @@ void TSymbolTable::copyTable(const TSymbolTable& copyOf)
{
assert(adoptedLevels == copyOf.adoptedLevels);
TStructureMap remapper;
uniqueId = copyOf.uniqueId;
noBuiltInRedeclarations = copyOf.noBuiltInRedeclarations;
for (unsigned int i = copyOf.adoptedLevels; i < copyOf.table.size(); ++i)
table.push_back(copyOf.table[i]->clone(remapper));
table.push_back(copyOf.table[i]->clone());
}
} // end namespace glslang