use static constructor for CEGLSync

Author: ikalco

src/helpers/sync/SyncReleaser.hpp

@@ -12,7 +12,6 @@
 */
 
 class CSyncTimeline;
-class CEGLSync;
 
 class CSyncReleaser {
   public:
@@ -29,5 +28,4 @@ class CSyncReleaser {
     SP<CSyncTimeline>              m_timeline;
     uint64_t                       m_point = 0;
     Hyprutils::OS::CFileDescriptor m_fd;
-    SP<CEGLSync>                   m_sync;
 };

src/render/OpenGL.cpp

@@ -3151,10 +3151,12 @@ float SRenderModifData::combinedScale() {
     return scale;
 }
 
-CEGLSync::CEGLSync() : sync(g_pHyprOpenGL->m_sProc.eglCreateSyncKHR(g_pHyprOpenGL->m_pEglDisplay, EGL_SYNC_NATIVE_FENCE_ANDROID, nullptr)) {
+UP<CEGLSync> CEGLSync::create() {
+    EGLSyncKHR sync = g_pHyprOpenGL->m_sProc.eglCreateSyncKHR(g_pHyprOpenGL->m_pEglDisplay, EGL_SYNC_NATIVE_FENCE_ANDROID, nullptr);
+
     if (sync == EGL_NO_SYNC_KHR) {
         Debug::log(ERR, "eglCreateSyncKHR failed");
-        return;
+        return nullptr;
     }
 
     // we need to flush otherwise we might not get a valid fd
@@ -3163,18 +3165,22 @@ CEGLSync::CEGLSync() : sync(g_pHyprOpenGL->m_sProc.eglCreateSyncKHR(g_pHyprOpenG
     int fd = g_pHyprOpenGL->m_sProc.eglDupNativeFenceFDANDROID(g_pHyprOpenGL->m_pEglDisplay, sync);
     if (fd == EGL_NO_NATIVE_FENCE_FD_ANDROID) {
         Debug::log(ERR, "eglDupNativeFenceFDANDROID failed");
-        return;
+        return nullptr;
     }
 
-    m_valid = true;
-    m_fd    = CFileDescriptor(fd);
+    UP<CEGLSync> eglSync(new CEGLSync);
+    eglSync->m_fd    = CFileDescriptor(fd);
+    eglSync->m_sync  = sync;
+    eglSync->m_valid = true;
+
+    return eglSync;
 }
 
 CEGLSync::~CEGLSync() {
-    if (sync == EGL_NO_SYNC_KHR)
+    if (m_sync == EGL_NO_SYNC_KHR)
         return;
 
-    if (g_pHyprOpenGL && g_pHyprOpenGL->m_sProc.eglDestroySyncKHR(g_pHyprOpenGL->m_pEglDisplay, sync) != EGL_TRUE)
+    if (g_pHyprOpenGL && g_pHyprOpenGL->m_sProc.eglDestroySyncKHR(g_pHyprOpenGL->m_pEglDisplay, m_sync) != EGL_TRUE)
         Debug::log(ERR, "eglDestroySyncKHR failed");
 }
 
@@ -3187,5 +3193,5 @@ CFileDescriptor&& CEGLSync::takeFd() {
 }
 
 bool CEGLSync::isValid() {
-    return m_valid && sync != EGL_NO_SYNC_KHR && m_fd.isValid();
+    return m_valid && m_sync != EGL_NO_SYNC_KHR && m_fd.isValid();
 }

src/render/OpenGL.hpp

@@ -150,16 +150,19 @@ struct SCurrentRenderData {
 
 class CEGLSync {
   public:
-    CEGLSync();
+    static UP<CEGLSync> create();
+
     ~CEGLSync();
 
     Hyprutils::OS::CFileDescriptor&  fd();
     Hyprutils::OS::CFileDescriptor&& takeFd();
     bool                             isValid();
 
   private:
+    CEGLSync() = default;
+
     Hyprutils::OS::CFileDescriptor m_fd;
-    EGLSyncKHR                     sync    = nullptr;
+    EGLSyncKHR                     m_sync  = EGL_NO_SYNC_KHR;
     bool                           m_valid = false;
 
     friend class CHyprOpenGLImpl;

src/render/Renderer.cpp

@@ -2285,27 +2285,27 @@ void CHyprRenderer::endRender(const std::function<void()>& renderingDoneCallback
     if (m_eRenderMode == RENDER_MODE_NORMAL)
         PMONITOR->output->state->setBuffer(m_pCurrentBuffer);
 
-    CEGLSync eglSync = CEGLSync();
-    if (eglSync.isValid()) {
+    UP<CEGLSync> eglSync = CEGLSync::create();
+    if (eglSync && eglSync->isValid()) {
         for (auto const& buf : usedAsyncBuffers) {
             for (const auto& releaser : buf->syncReleasers) {
-                releaser->addSyncFileFd(eglSync.fd());
+                releaser->addSyncFileFd(eglSync->fd());
             }
         }
 
         // release buffer refs with release points now, since syncReleaser handles actual buffer release based on EGLSync
         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(), [renderingDoneCallback, prevbfs = std::move(usedAsyncBuffers)]() mutable {
+        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) {
-            PMONITOR->inFence = eglSync.takeFd();
+            PMONITOR->inFence = eglSync->takeFd();
             PMONITOR->output->state->setExplicitInFence(PMONITOR->inFence.get());
         }
     } else {