From 9acbea138979fa0e311343fc1510e3d668955f57 Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Wed, 17 Apr 2024 21:49:31 +0200
Subject: [PATCH] metal: discard presentation feedback when presentation fails

---
 src/backends/metal/video.rs | 11 +++++++----
 src/renderer.rs             |  7 +++++++
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/backends/metal/video.rs b/src/backends/metal/video.rs
index 4a598416..9d17d04c 100644
--- a/src/backends/metal/video.rs
+++ b/src/backends/metal/video.rs
@@ -765,6 +765,9 @@ impl MetalConnector {
         if let Err(e) = changes.commit(DRM_MODE_ATOMIC_NONBLOCK | DRM_MODE_PAGE_FLIP_EVENT, 0) {
             if let DrmError::Atomic(OsError(c::EACCES)) = e {
                 log::debug!("Could not perform atomic commit, likely because we're no longer the DRM master");
+                self.render_result
+                    .borrow_mut()
+                    .discard_presentation_feedback();
                 return Ok(());
             }
             if let Some(fb) = &new_fb {
@@ -784,6 +787,9 @@ impl MetalConnector {
                     }
                 }
             }
+            self.render_result
+                .borrow_mut()
+                .discard_presentation_feedback();
             Err(MetalError::Commit(e))
         } else {
             if let Some(fb) = new_fb {
@@ -1792,10 +1798,7 @@ impl MetalBackend {
                     let _ = fb.client.remove_obj(&*fb);
                 }
             } else {
-                for fb in rr.presentation_feedbacks.drain(..) {
-                    fb.send_discarded();
-                    let _ = fb.client.remove_obj(&*fb);
-                }
+                rr.discard_presentation_feedback();
             }
         }
     }
diff --git a/src/renderer.rs b/src/renderer.rs
index 4f23949c..502c817e 100644
--- a/src/renderer.rs
+++ b/src/renderer.rs
@@ -42,6 +42,13 @@ impl RenderResult {
             let _ = fr.client.remove_obj(&*fr);
         }
     }
+
+    pub fn discard_presentation_feedback(&mut self) {
+        for fb in self.presentation_feedbacks.drain(..) {
+            fb.send_discarded();
+            let _ = fb.client.remove_obj(&*fb);
+        }
+    }
 }
 
 impl Debug for RenderResult {