From 301b48b74087cc59753ffa144b215540e6f82831 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Sun, 18 Feb 2024 16:04:08 +0000
Subject: [PATCH] renderer: fix invalid damage accumulation with invalid
 buffer_age

fixes #4670
---
 src/render/Renderer.cpp | 74 ++++++++++++++++++++---------------------
 src/render/Renderer.hpp |  1 -
 2 files changed, 36 insertions(+), 39 deletions(-)

diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 9d7bb5e1..fc676ad9 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1098,11 +1098,42 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
     if (UNLOCK_SC)
         wlr_output_lock_software_cursors(pMonitor->output, true);
 
-    CRegion damage;
-    wlr_damage_ring_get_buffer_damage(&pMonitor->damage, m_iLastBufferAge, damage.pixman());
+    if (pMonitor->forceFullFrames > 0) {
+        pMonitor->forceFullFrames -= 1;
+        if (pMonitor->forceFullFrames > 10)
+            pMonitor->forceFullFrames = 0;
+    }
 
     pMonitor->renderingActive = true;
 
+    TRACY_GPU_ZONE("Render");
+
+    if (pMonitor == g_pCompositor->getMonitorFromCursor())
+        g_pHyprOpenGL->m_RenderData.mouseZoomFactor = std::clamp(**PZOOMFACTOR, 1.f, INFINITY);
+    else
+        g_pHyprOpenGL->m_RenderData.mouseZoomFactor = 1.f;
+
+    if (zoomInFactorFirstLaunch > 1.f) {
+        g_pHyprOpenGL->m_RenderData.mouseZoomFactor    = zoomInFactorFirstLaunch;
+        g_pHyprOpenGL->m_RenderData.mouseZoomUseMouse  = false;
+        g_pHyprOpenGL->m_RenderData.useNearestNeighbor = false;
+    }
+
+    CRegion damage;
+
+    if (!beginRender(pMonitor, damage, RENDER_MODE_NORMAL)) {
+        Debug::log(ERR, "renderer: couldn't beginRender()!");
+
+        if (UNLOCK_SC)
+            wlr_output_lock_software_cursors(pMonitor->output, false);
+
+        pMonitor->state.clear();
+
+        return;
+    }
+
+    wlr_damage_ring_rotate_buffer(&pMonitor->damage, m_pCurrentWlrBuffer, damage.pixman());
+
     // we need to cleanup fading out when rendering the appropriate context
     g_pCompositor->cleanupFadingOut(pMonitor->ID);
 
@@ -1134,38 +1165,8 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
         }
     }
 
-    if (pMonitor->forceFullFrames > 0) {
-        pMonitor->forceFullFrames -= 1;
-        if (pMonitor->forceFullFrames > 10)
-            pMonitor->forceFullFrames = 0;
-    }
-
-    // TODO: this is getting called with extents being 0,0,0,0 should it be?
-    // potentially can save on resources.
-
-    TRACY_GPU_ZONE("Render");
-
-    if (pMonitor == g_pCompositor->getMonitorFromCursor())
-        g_pHyprOpenGL->m_RenderData.mouseZoomFactor = std::clamp(**PZOOMFACTOR, 1.f, INFINITY);
-    else
-        g_pHyprOpenGL->m_RenderData.mouseZoomFactor = 1.f;
-
-    if (zoomInFactorFirstLaunch > 1.f) {
-        g_pHyprOpenGL->m_RenderData.mouseZoomFactor    = zoomInFactorFirstLaunch;
-        g_pHyprOpenGL->m_RenderData.mouseZoomUseMouse  = false;
-        g_pHyprOpenGL->m_RenderData.useNearestNeighbor = false;
-    }
-
-    if (!beginRender(pMonitor, damage, RENDER_MODE_NORMAL)) {
-        Debug::log(ERR, "renderer: couldn't beginRender()!");
-
-        if (UNLOCK_SC)
-            wlr_output_lock_software_cursors(pMonitor->output, false);
-
-        pMonitor->state.clear();
-
-        return;
-    }
+    // apply modified damage to render pass
+    g_pHyprOpenGL->m_RenderData.damage.set(damage);
 
     EMIT_HOOK_EVENT("render", RENDER_BEGIN);
 
@@ -1263,8 +1264,6 @@ void CHyprRenderer::renderMonitor(CMonitor* pMonitor) {
     if (shouldTear)
         pMonitor->tearingState.busy = true;
 
-    wlr_damage_ring_rotate(&pMonitor->damage);
-
     if (UNLOCK_SC)
         wlr_output_lock_software_cursors(pMonitor->output, false);
 
@@ -2470,7 +2469,7 @@ bool CHyprRenderer::beginRender(CMonitor* pMonitor, CRegion& damage, eRenderMode
         if (!wlr_output_configure_primary_swapchain(pMonitor->output, pMonitor->state.wlr(), &pMonitor->output->swapchain))
             return false;
 
-        m_pCurrentWlrBuffer = wlr_swapchain_acquire(pMonitor->output->swapchain, &m_iLastBufferAge);
+        m_pCurrentWlrBuffer = wlr_swapchain_acquire(pMonitor->output->swapchain, nullptr);
         if (!m_pCurrentWlrBuffer)
             return false;
     } else {
@@ -2521,7 +2520,6 @@ void CHyprRenderer::endRender() {
 
     m_pCurrentRenderbuffer = nullptr;
     m_pCurrentWlrBuffer    = nullptr;
-    m_iLastBufferAge       = 0;
 }
 
 void CHyprRenderer::onRenderbufferDestroy(CRenderbuffer* rb) {
diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
index f77bf36e..cd873db0 100644
--- a/src/render/Renderer.hpp
+++ b/src/render/Renderer.hpp
@@ -122,7 +122,6 @@ class CHyprRenderer {
     CRenderbuffer* m_pCurrentRenderbuffer = nullptr;
     wlr_buffer*    m_pCurrentWlrBuffer    = nullptr;
     eRenderMode    m_eRenderMode          = RENDER_MODE_NORMAL;
-    int            m_iLastBufferAge       = 0;
 
     bool           m_bNvidia = false;