From d5689bb53935ff1adbbfc9fdf5b1f542ce39efb2 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Sat, 26 Oct 2024 02:06:13 +0100
Subject: internal: cleanup CMonitor usage and fix a few ref hogs

ref #8221
---
 src/render/OpenGL.hpp   | 36 ++++++++++++++++++------------------
 src/render/Renderer.cpp |  4 ++--
 src/render/Renderer.hpp |  4 ++--
 3 files changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/render')

diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp
index 04f69d49..115dcac7 100644
--- a/src/render/OpenGL.hpp
+++ b/src/render/OpenGL.hpp
@@ -206,30 +206,30 @@ class CHyprOpenGLImpl {
     void     setDamage(const CRegion& damage, std::optional<CRegion> finalDamage = {});
 
     uint32_t getPreferredReadFormat(PHLMONITOR pMonitor);
-    std::vector<SDRMFormat>                               getDRMFormats();
-    EGLImageKHR                                           createEGLImage(const Aquamarine::SDMABUFAttrs& attrs);
-    SP<CEGLSync>                                          createEGLSync(int fenceFD);
-    bool                                                  waitForTimelinePoint(SP<CSyncTimeline> timeline, uint64_t point);
+    std::vector<SDRMFormat>                     getDRMFormats();
+    EGLImageKHR                                 createEGLImage(const Aquamarine::SDMABUFAttrs& attrs);
+    SP<CEGLSync>                                createEGLSync(int fenceFD);
+    bool                                        waitForTimelinePoint(SP<CSyncTimeline> timeline, uint64_t point);
 
-    SCurrentRenderData                                    m_RenderData;
+    SCurrentRenderData                          m_RenderData;
 
-    GLint                                                 m_iCurrentOutputFb = 0;
+    GLint                                       m_iCurrentOutputFb = 0;
 
-    int                                                   m_iGBMFD      = -1;
-    gbm_device*                                           m_pGbmDevice  = nullptr;
-    EGLContext                                            m_pEglContext = nullptr;
-    EGLDisplay                                            m_pEglDisplay = nullptr;
-    EGLDeviceEXT                                          m_pEglDevice  = nullptr;
+    int                                         m_iGBMFD      = -1;
+    gbm_device*                                 m_pGbmDevice  = nullptr;
+    EGLContext                                  m_pEglContext = nullptr;
+    EGLDisplay                                  m_pEglDisplay = nullptr;
+    EGLDeviceEXT                                m_pEglDevice  = nullptr;
 
-    bool                                                  m_bReloadScreenShader = true; // at launch it can be set
+    bool                                        m_bReloadScreenShader = true; // at launch it can be set
 
-    PHLWINDOWREF                                          m_pCurrentWindow; // hack to get the current rendered window
-    PHLLS                                                 m_pCurrentLayer;  // hack to get the current rendered layer
+    PHLWINDOWREF                                m_pCurrentWindow; // hack to get the current rendered window
+    PHLLS                                       m_pCurrentLayer;  // hack to get the current rendered layer
 
-    std::map<PHLWINDOWREF, CFramebuffer>                  m_mWindowFramebuffers;
-    std::map<PHLLSREF, CFramebuffer>                      m_mLayerFramebuffers;
-    std::unordered_map<PHLMONITORREF, SMonitorRenderData> m_mMonitorRenderResources;
-    std::unordered_map<PHLMONITORREF, CFramebuffer>       m_mMonitorBGFBs;
+    std::map<PHLWINDOWREF, CFramebuffer>        m_mWindowFramebuffers;
+    std::map<PHLLSREF, CFramebuffer>            m_mLayerFramebuffers;
+    std::map<PHLMONITORREF, SMonitorRenderData> m_mMonitorRenderResources;
+    std::map<PHLMONITORREF, CFramebuffer>       m_mMonitorBGFBs;
 
     struct {
         PFNGLEGLIMAGETARGETRENDERBUFFERSTORAGEOESPROC glEGLImageTargetRenderbufferStorageOES = nullptr;
diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp
index 5df0c070..c69167c8 100644
--- a/src/render/Renderer.cpp
+++ b/src/render/Renderer.cpp
@@ -1085,7 +1085,7 @@ void CHyprRenderer::renderSessionLockMissing(PHLMONITOR pMonitor) {
         g_pSessionLockManager->onLockscreenRenderedOnMonitor(pMonitor->ID);
 }
 
-void CHyprRenderer::calculateUVForSurface(PHLWINDOW pWindow, SP<CWLSurfaceResource> pSurface, SP<CMonitor> pMonitor, bool main, const Vector2D& projSize,
+void CHyprRenderer::calculateUVForSurface(PHLWINDOW pWindow, SP<CWLSurfaceResource> pSurface, PHLMONITOR pMonitor, bool main, const Vector2D& projSize,
                                           const Vector2D& projSizeUnscaled, bool fixMisalignedFSV1) {
     if (!pWindow || !pWindow->m_bIsX11) {
         Vector2D uvTL;
@@ -1603,7 +1603,7 @@ void CHyprRenderer::sendFrameEventsToWorkspace(PHLMONITOR pMonitor, PHLWORKSPACE
     }
 }
 
-void CHyprRenderer::setSurfaceScanoutMode(SP<CWLSurfaceResource> surface, SP<CMonitor> monitor) {
+void CHyprRenderer::setSurfaceScanoutMode(SP<CWLSurfaceResource> surface, PHLMONITOR monitor) {
     if (!PROTO::linuxDma)
         return;
 
diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp
index 41f40b5a..4524008b 100644
--- a/src/render/Renderer.hpp
+++ b/src/render/Renderer.hpp
@@ -64,7 +64,7 @@ class CHyprRenderer {
     void ensureCursorRenderingMode();
     bool shouldRenderCursor();
     void setCursorHidden(bool hide);
-    void calculateUVForSurface(PHLWINDOW, SP<CWLSurfaceResource>, SP<CMonitor> pMonitor, bool main = false, const Vector2D& projSize = {}, const Vector2D& projSizeUnscaled = {},
+    void calculateUVForSurface(PHLWINDOW, SP<CWLSurfaceResource>, PHLMONITOR pMonitor, bool main = false, const Vector2D& projSize = {}, const Vector2D& projSizeUnscaled = {},
                                bool fixMisalignedFSV1 = false);
     std::tuple<float, float, float> getRenderTimes(PHLMONITOR pMonitor); // avg max min
     void                            renderLockscreen(PHLMONITOR pMonitor, timespec* now, const CBox& geometry);
@@ -95,7 +95,7 @@ class CHyprRenderer {
     DAMAGETRACKINGMODES
     damageTrackingModeFromStr(const std::string&);
 
-    void                                setSurfaceScanoutMode(SP<CWLSurfaceResource> surface, SP<CMonitor> monitor); // nullptr monitor resets
+    void                                setSurfaceScanoutMode(SP<CWLSurfaceResource> surface, PHLMONITOR monitor); // nullptr monitor resets
     void                                initiateManualCrash();
 
     bool                                m_bCrashingInProgress = false;
-- 
cgit v1.2.3