Fix for mir_performance_tests failure due to not cleaning up our disp…

…lays (#3080)
canonical · Oct 18, 2023 · 926748e · 926748e
1 parent 7285052
commit 926748e
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 0 deletions.
diff --git a/src/platforms/eglstream-kms/server/display.cpp b/src/platforms/eglstream-kms/server/display.cpp
@@ -181,6 +181,21 @@ class DisplayBuffer
         pending_flip = satisfied_promise.get_future();
     }
 
+    ~DisplayBuffer()
+    {
+        if (output_stream != EGL_NO_STREAM_KHR)
+        {
+            eglDestroyStreamKHR(dpy, output_stream);
+            output_stream = nullptr;
+        }
+
+        if (ctx != EGL_NO_CONTEXT)
+        {
+            eglDestroyContext(dpy, ctx);
+            ctx = nullptr;
+        }
+    }
+
     mir::geometry::Rectangle view_area() const override
     {
         return view_area_;

diff --git a/src/platforms/eglstream-kms/server/platform.cpp b/src/platforms/eglstream-kms/server/platform.cpp
@@ -248,6 +248,14 @@ mge::DisplayPlatform::DisplayPlatform(
     provider = std::make_shared<InterfaceProvider>(display);
 }
 
+mge::DisplayPlatform::~DisplayPlatform()
+{
+    if (display != EGL_NO_DISPLAY)
+    {
+        eglTerminate(display);
+    }
+}
+
 auto mge::DisplayPlatform::create_display(
     std::shared_ptr<DisplayConfigurationPolicy> const& configuration_policy,
     std::shared_ptr<GLConfig> const& gl_config)

diff --git a/src/platforms/eglstream-kms/server/platform.h b/src/platforms/eglstream-kms/server/platform.h
@@ -65,6 +65,8 @@ class DisplayPlatform : public graphics::DisplayPlatform
         EGLDeviceEXT device,
         std::shared_ptr<DisplayReport> display_report);
 
+    ~DisplayPlatform();
+
     auto create_display(
         std::shared_ptr<DisplayConfigurationPolicy> const& initial_conf_policy,
         std::shared_ptr<GLConfig> const& gl_config)