moved back to direct naming

Author: gaaclarke

impeller/renderer/backend/gles/reactor_gles.cc

@@ -301,7 +301,6 @@ bool ReactorGLES::ConsolidateHandles() {
     WriterLock handles_lock(handles_mutex_);
     handles_to_delete.reserve(handles_to_collect_count_);
     handles_to_collect_count_ = 0;
-    std::swap(handles_to_name, handles_to_name_);
     for (auto& handle : handles_) {
       // Collect dead handles.
       if (handle.second.pending_collection) {
@@ -394,12 +393,13 @@ void ReactorGLES::SetDebugLabel(const HandleGLES& handle,
   if (handle.IsDead()) {
     return;
   }
-  WriterLock handles_lock(handles_mutex_);
   if (handle.untracked_id_.has_value()) {
-    handles_to_name_.emplace_back(
-        std::make_tuple(ToDebugResourceType(handle.GetType()),
-                        handle.untracked_id_.value(), std::string(label)));
+    FML_DCHECK(CanReactOnCurrentThread());
+    const auto& gl = GetProcTable();
+    gl.SetDebugLabel(ToDebugResourceType(handle.GetType()),
+                     handle.untracked_id_.value(), std::string(label));
   } else {
+    WriterLock handles_lock(handles_mutex_);
     if (auto found = handles_.find(handle); found != handles_.end()) {
       found->second.pending_debug_label = label;
     }

impeller/renderer/backend/gles/reactor_gles.h

@@ -296,9 +296,6 @@ class ReactorGLES {
   mutable RWMutex handles_mutex_;
   LiveHandles handles_ IPLR_GUARDED_BY(handles_mutex_);
   int32_t handles_to_collect_count_ IPLR_GUARDED_BY(handles_mutex_) = 0;
-  std::vector<
-      std::tuple<DebugResourceType, GLint, std::string>> handles_to_name_
-      IPLR_GUARDED_BY(handles_mutex_);
 
   mutable Mutex workers_mutex_;
   mutable std::map<WorkerID, std::weak_ptr<Worker>> workers_ IPLR_GUARDED_BY(

impeller/renderer/backend/gles/test/reactor_unittests.cc

@@ -103,9 +103,6 @@ TEST(ReactorGLES, NameUntrackedHandle) {
   HandleGLES handle = reactor->CreateUntrackedHandle(HandleType::kTexture);
   mock_gles->GetCapturedCalls();
   reactor->SetDebugLabel(handle, "hello, joe!");
-  // Without an operation nothing is cleaned up.
-  EXPECT_TRUE(reactor->AddOperation([&](const ReactorGLES&) {}));
-  EXPECT_TRUE(reactor->React());
   std::vector<std::string> calls = mock_gles->GetCapturedCalls();
   EXPECT_TRUE(std::find(calls.begin(), calls.end(), "glObjectLabelKHR") !=
               calls.end());