From 80b9b21f9f24b6e8db2fc6f7705cd124f436ffba Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sat, 2 Dec 2023 14:51:35 +0000 Subject: [PATCH] opengl: fix nvidia read formats fixes #4023 --- src/render/OpenGL.cpp | 10 +++++----- src/render/OpenGL.hpp | 4 ++++ 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index 30187862..cbfe56e8 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -35,6 +35,8 @@ CHyprOpenGLImpl::CHyprOpenGLImpl() { loadGLProc(&m_sProc.glEGLImageTargetRenderbufferStorageOES, "glEGLImageTargetRenderbufferStorageOES"); loadGLProc(&m_sProc.eglDestroyImageKHR, "eglDestroyImageKHR"); + m_sExts.EXT_read_format_bgra = m_szExtensions.contains("GL_EXT_read_format_bgra"); + #ifdef USE_TRACY_GPU loadGLProc(&glQueryCounter, "glQueryCounterEXT"); @@ -2067,12 +2069,10 @@ void CHyprOpenGLImpl::setMonitorTransformEnabled(bool enabled) { uint32_t CHyprOpenGLImpl::getPreferredReadFormat(CMonitor* pMonitor) { if (g_pHyprRenderer->isNvidia()) - return DRM_FORMAT_XRGB8888; - - if (pMonitor->drmFormat == DRM_FORMAT_XRGB8888) return DRM_FORMAT_XBGR8888; - if (pMonitor->drmFormat == DRM_FORMAT_XBGR8888) - return DRM_FORMAT_XRGB8888; + + if (pMonitor->drmFormat == DRM_FORMAT_XRGB8888 || pMonitor->drmFormat == DRM_FORMAT_XBGR8888) + return DRM_FORMAT_XBGR8888; if (pMonitor->drmFormat == DRM_FORMAT_XRGB2101010 || pMonitor->drmFormat == DRM_FORMAT_XBGR2101010) return DRM_FORMAT_XBGR2101010; return DRM_FORMAT_INVALID; diff --git a/src/render/OpenGL.hpp b/src/render/OpenGL.hpp index 2830870b..c3726575 100644 --- a/src/render/OpenGL.hpp +++ b/src/render/OpenGL.hpp @@ -179,6 +179,10 @@ class CHyprOpenGLImpl { PFNEGLDESTROYIMAGEKHRPROC eglDestroyImageKHR = nullptr; } m_sProc; + struct { + bool EXT_read_format_bgra = false; + } m_sExts; + private: std::list m_lBuffers; std::list m_lTextures;