Remove dedicated name from SymbolTable entries.
We now assume that the Symbol's name() is its actual name, instead of
having it passed it in by the caller. This simplifies calling code, and
also removes redundant symbol names from the Dehydrator, saving a few
hundred bytes here and there.
Change-Id: I3e3d65b238ea58ab52f5dca205458d6f45c06c3d
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/323110
Commit-Queue: John Stiles <johnstiles@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
Auto-Submit: John Stiles <johnstiles@google.com>
diff --git a/src/sksl/SkSLCompiler.cpp b/src/sksl/SkSLCompiler.cpp
index de6a241..fe5f27e 100644
--- a/src/sksl/SkSLCompiler.cpp
+++ b/src/sksl/SkSLCompiler.cpp
@@ -120,8 +120,7 @@
fRootSymbolTable = std::make_shared<SymbolTable>(this);
fIRGenerator =
std::make_unique<IRGenerator>(fContext.get(), &fInliner, fRootSymbolTable, *this);
- #define ADD_TYPE(t) fRootSymbolTable->addWithoutOwnership(fContext->f ## t ## _Type->name(), \
- fContext->f ## t ## _Type.get())
+ #define ADD_TYPE(t) fRootSymbolTable->addWithoutOwnership(fContext->f ## t ## _Type.get())
ADD_TYPE(Void);
ADD_TYPE(Float);
ADD_TYPE(Float2);
@@ -249,8 +248,7 @@
// sk_Caps is "builtin", but all references to it are resolved to Settings, so we don't need to
// treat it as builtin (ie, no need to clone it into the Program).
StringFragment skCapsName("sk_Caps");
- fRootSymbolTable->add(skCapsName,
- std::make_unique<Variable>(/*offset=*/-1,
+ fRootSymbolTable->add(std::make_unique<Variable>(/*offset=*/-1,
fIRGenerator->fModifiers->handle(Modifiers()),
skCapsName, fContext->fSkCaps_Type.get(),
/*builtin=*/false, Variable::kGlobal_Storage));
@@ -1628,7 +1626,7 @@
// Add any external values to the symbol table. IRGenerator::start() has pushed a table, so
// we're only making these visible to the current Program.
for (const auto& ev : *externalValues) {
- fIRGenerator->fSymbolTable->addWithoutOwnership(ev->name(), ev.get());
+ fIRGenerator->fSymbolTable->addWithoutOwnership(ev.get());
}
}
std::unique_ptr<String> textPtr(new String(std::move(text)));