add renderingDoneCallback and use it in screencopy

Author: ikalco

src/helpers/Monitor.cpp

@@ -60,10 +60,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

@@ -229,21 +229,11 @@ void CScreencopyFrame::copyDmabuf(std::function<void(bool)> callback) {
     }
 
     g_pHyprOpenGL->m_RenderData.blockScreenShader = true;
-    g_pHyprRenderer->endRender();
 
-    auto explicitOptions = g_pHyprRenderer->getExplicitSyncSettings(pMonitor->output);
-    if (pMonitor->inTimeline && explicitOptions.explicitEnabled) {
-        if (pMonitor->inTimeline->addWaiter(
-                [callback, sync = pMonitor->eglSync]() {
-                    LOGM(TRACE, "Copied frame via dma with explicit sync");
-                    callback(true);
-                },
-                pMonitor->inTimelinePoint, 0))
-            return;
-        // on explicit sync failure, fallthrough to immediate callback
-    }
-    LOGM(TRACE, "Copied frame via dma");
-    callback(true);
+    g_pHyprRenderer->endRender([callback]() {
+        LOGM(TRACE, "Copied frame via dma");
+        callback(true);
+    });
 }
 
 bool CScreencopyFrame::copyShm() {

src/render/Renderer.cpp

@@ -2237,7 +2237,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;
     static auto PNVIDIAANTIFLICKER = CConfigValue<Hyprlang::INT>("opengl:nvidia_anti_flicker");
 
@@ -2279,7 +2279,11 @@ void CHyprRenderer::endRender() {
         std::erase_if(usedAsyncBuffers, [](const auto& buf) { return !buf->syncReleasers.empty(); });
 
         // release buffer refs without release points when EGLSync sync_file/fence is signalled
-        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 {
+            prevbfs.clear();
+            if (renderingDoneCallback)
+                renderingDoneCallback();
+        });
         usedAsyncBuffers.clear();
 
         if (m_eRenderMode == RENDER_MODE_NORMAL) {
@@ -2294,6 +2298,8 @@ void CHyprRenderer::endRender() {
             glFinish();
 
         usedAsyncBuffers.clear(); // release all buffer refs and hope implicit sync works
+        if (renderingDoneCallback)
+            renderingDoneCallback();
     }
 }
 

src/render/Renderer.hpp

@@ -87,7 +87,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;