Fix GlContext (attachments) cleanup in case of a failing GlContext in…

…itialization. PiperOrigin-RevId: 600974501
google-ai-edge · Jan 24, 2024 · 1033f56 · 1033f56
1 parent b76b7e2
commit 1033f56
Showing 1 changed file with 8 additions and 10 deletions.
diff --git a/mediapipe/gpu/gl_context.cc b/mediapipe/gpu/gl_context.cc
@@ -409,17 +409,15 @@ GlContext::~GlContext() {
     if (thread_->IsCurrentThread()) {
       thread_.release()->SelfDestruct();
     }
-  } else {
-    if (IsCurrent()) {
+  } else if (IsCurrent()) {
+    clear_attachments();
+  } else if (HasContext()) {
+    ContextBinding saved_context;
+    auto status = SwitchContextAndRun([&clear_attachments] {
       clear_attachments();
-    } else {
-      ContextBinding saved_context;
-      auto status = SwitchContextAndRun([&clear_attachments] {
-        clear_attachments();
-        return absl::OkStatus();
-      });
-      ABSL_LOG_IF(ERROR, !status.ok()) << status;
-    }
+      return absl::OkStatus();
+    });
+    ABSL_LOG_IF(ERROR, !status.ok()) << status;
   }
   DestroyContext();
 }