add renderingDoneCallback and use it in screencopy

Author: ikalco

src/helpers/Monitor.cpp

@@ -55,10 +55,6 @@ void CMonitor::onConnect(bool noRule) {
 
     g_pEventLoopManager->doLater([] { g_pConfigManager->ensurePersistentWorkspacesPresent(); });
 
-    if (output->supportsExplicit) {
-        inTimeline = CSyncTimeline::create(output->getBackend()->drmFD());
-    }
-
     listeners.frame  = output->events.frame.registerListener([this](std::any d) { onMonitorFrame(); });
     listeners.commit = output->events.commit.registerListener([this](std::any d) {
         if (true) { // FIXME: E->state->committed & WLR_OUTPUT_STATE_BUFFER

src/helpers/Monitor.hpp

@@ -139,9 +139,7 @@ class CMonitor {
     SMonitorRule                activeMonitorRule;
 
     // explicit sync
-    SP<CSyncTimeline>              inTimeline;
     Hyprutils::OS::CFileDescriptor inFence; // TODO: remove when aq uses CFileDescriptor
-    uint64_t                       inTimelinePoint = 0;
 
     PHLMONITORREF                  self;
 

src/protocols/Screencopy.cpp

@@ -216,20 +216,10 @@ void CScreencopyFrame::copyDmabuf(std::function<void(bool)> callback) {
     g_pHyprOpenGL->setMonitorTransformEnabled(false);
 
     g_pHyprOpenGL->m_RenderData.blockScreenShader = true;
-    g_pHyprRenderer->endRender();
-
-    auto explicitOptions = g_pHyprRenderer->getExplicitSyncSettings(pMonitor->output);
-    if (pMonitor->inTimeline && explicitOptions.explicitEnabled) {
-        pMonitor->inTimeline->addWaiter(
-            [callback]() {
-                LOGM(TRACE, "Copied frame via dma with explicit sync");
-                callback(true);
-            },
-            pMonitor->inTimelinePoint, 0);
-    } else {
+    g_pHyprRenderer->endRender([callback]() {
         LOGM(TRACE, "Copied frame via dma");
         callback(true);
-    }
+    });
 }
 
 bool CScreencopyFrame::copyShm() {

src/render/Renderer.cpp

@@ -2239,7 +2239,7 @@ bool CHyprRenderer::beginRender(PHLMONITOR pMonitor, CRegion& damage, eRenderMod
     return true;
 }
 
-void CHyprRenderer::endRender() {
+void CHyprRenderer::endRender(const std::function<void()>& renderingDoneCallback) {
     const auto PMONITOR = g_pHyprOpenGL->m_RenderData.pMonitor;
 
     g_pHyprOpenGL->m_RenderData.damage = m_sRenderPass.render(g_pHyprOpenGL->m_RenderData.damage);
@@ -2278,7 +2278,11 @@ void CHyprRenderer::endRender() {
 
         // release all CHLBufferRefernce when EGLSync sync_file/fence is signalled,
         // meaning that when opengl rendering is done we can send release for all used buffers
-        g_pEventLoopManager->doOnReadable(eglSync.fd().duplicate(), [prevbfs = std::move(usedAsyncBuffers)]() mutable { prevbfs.clear(); });
+        g_pEventLoopManager->doOnReadable(eglSync.fd().duplicate(), [renderingDoneCallback, prevbfs = std::move(usedAsyncBuffers)]() mutable {
+            if (renderingDoneCallback)
+                renderingDoneCallback();
+            prevbfs.clear();
+        });
         usedAsyncBuffers.clear();
 
         if (m_eRenderMode == RENDER_MODE_NORMAL) {
@@ -2292,6 +2296,9 @@ void CHyprRenderer::endRender() {
         // plus we can only release buffers if we know rendering from them is done
         glFinish();
         usedAsyncBuffers.clear();
+
+        if (renderingDoneCallback)
+            renderingDoneCallback();
     }
 }
 

src/render/Renderer.hpp

@@ -86,7 +86,7 @@ class CHyprRenderer {
     // if RENDER_MODE_NORMAL, provided damage will be written to.
     // otherwise, it will be the one used.
     bool beginRender(PHLMONITOR pMonitor, CRegion& damage, eRenderMode mode = RENDER_MODE_NORMAL, SP<IHLBuffer> buffer = {}, CFramebuffer* fb = nullptr, bool simple = false);
-    void endRender();
+    void endRender(const std::function<void()>& renderingDoneCallback = {});
 
     bool m_bBlockSurfaceFeedback = false;
     bool m_bRenderingSnapshot    = false;