From 6ab5a0befb45e90eb45b8d6582e68d13147297dc Mon Sep 17 00:00:00 2001
From: UjinT34 <41110182+UjinT34@users.noreply.github.com>
Date: Sat, 22 Mar 2025 20:34:01 +0300
Subject: renderer: fix cm_fs_passthrough (#9698)

---
 src/render/OpenGL.cpp | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

(limited to 'src/render/OpenGL.cpp')

diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp
index e2f72fff..6f148ba9 100644
--- a/src/render/OpenGL.cpp
+++ b/src/render/OpenGL.cpp
@@ -1379,13 +1379,15 @@ void CHyprOpenGLImpl::renderTextureInternalWithDamage(SP<CTexture> tex, const CB
         glTexParameteri(tex->m_iTarget, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
     }
 
-    const bool SURFACE_HAS_CM = m_RenderData.surface && m_RenderData.surface->colorManagement && m_RenderData.surface->colorManagement->hasImageDescription();
-
-    const bool skipCM = !*PENABLECM                                                            /* CM disabled by the user */
-        || !m_RenderData.surface                                                               /* No surface - no point in CM */
-        || !m_bCMSupported                                                                     /* CM unsupported - hw failed to compile the shader probably */
-        || (!SURFACE_HAS_CM && m_RenderData.pMonitor->imageDescription == SImageDescription{}) /* Surface doesn't have CM and monitor isn't CM'd */
-        || (*PPASS && m_RenderData.pMonitor->activeWorkspace && m_RenderData.pMonitor->activeWorkspace->m_bHasFullscreenWindow &&
+    const auto imageDescription =
+        m_RenderData.surface.valid() && m_RenderData.surface->colorManagement.valid() ? m_RenderData.surface->colorManagement->imageDescription() : SImageDescription{};
+
+    const bool skipCM = !*PENABLECM                                      /* CM disabled by the user */
+        || !m_RenderData.surface                                         /* No surface - no point in CM */
+        || !m_bCMSupported                                               /* CM unsupported - hw failed to compile the shader probably */
+        || (imageDescription == m_RenderData.pMonitor->imageDescription) /* Source and target have the same image description */
+        || ((*PPASS == 1 || (*PPASS == 2 && imageDescription.transferFunction == CM_TRANSFER_FUNCTION_ST2084_PQ)) && m_RenderData.pMonitor->activeWorkspace &&
+            m_RenderData.pMonitor->activeWorkspace->m_bHasFullscreenWindow &&
             m_RenderData.pMonitor->activeWorkspace->m_efFullscreenMode == FSMODE_FULLSCREEN) /* Fullscreen window with pass cm enabled */;
 
     glUseProgram(shader->program);
-- 
cgit v1.2.3