Use namer in the Inspector.
This CL adds the namer to the Inspector when getting the remapped name.
Change-Id: Ic5ed8c50a24b7a1cc303767d049a358181d27603
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/36661
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
Reviewed-by: Ben Clayton <bclayton@google.com>
diff --git a/src/inspector/inspector.cc b/src/inspector/inspector.cc
index 7ef2311..8d8c1fe 100644
--- a/src/inspector/inspector.cc
+++ b/src/inspector/inspector.cc
@@ -43,7 +43,8 @@
namespace tint {
namespace inspector {
-Inspector::Inspector(const ast::Module& module) : module_(module) {}
+Inspector::Inspector(ast::Module& module)
+ : module_(module), namer_(std::make_unique<UnsafeNamer>(&module)) {}
Inspector::~Inspector() = default;
@@ -77,15 +78,11 @@
std::string Inspector::GetRemappedNameForEntryPoint(
const std::string& entry_point) {
- // TODO(rharrison): Reenable once all of the backends are using the renamed
- // entry points.
-
- // auto* func = FindEntryPointByName(entry_point);
- // if (!func) {
- // return {};
- // }
- // return func->name();
- return entry_point;
+ auto* func = FindEntryPointByName(entry_point);
+ if (!func) {
+ return {};
+ }
+ return namer_->NameFor(func->symbol());
}
std::map<uint32_t, Scalar> Inspector::GetConstantIDs() {
diff --git a/src/inspector/inspector.h b/src/inspector/inspector.h
index 552dab6..ea82e1b 100644
--- a/src/inspector/inspector.h
+++ b/src/inspector/inspector.h
@@ -25,6 +25,7 @@
#include "src/ast/pipeline_stage.h"
#include "src/inspector/entry_point.h"
#include "src/inspector/scalar.h"
+#include "src/namer.h"
namespace tint {
namespace inspector {
@@ -72,7 +73,7 @@
public:
/// Constructor
/// @param module Shader module to extract information from.
- explicit Inspector(const ast::Module& module);
+ explicit Inspector(ast::Module& module);
~Inspector();
/// @returns error messages from the Inspector
@@ -128,6 +129,7 @@
private:
const ast::Module& module_;
+ std::unique_ptr<Namer> namer_;
std::string error_;
/// @param name name of the entry point to find