From b329ea8e96348c38c6c2c4ec18f74bdaeae09dcf Mon Sep 17 00:00:00 2001 From: Tom Englund Date: Sun, 24 Aug 2025 22:32:13 +0200 Subject: syncobj: use rendernode for timelines (#11087) * syncobj: use rendernode for timelines use rendernode for timelines instead of the drmfd, some devices dont support to use the drmfd for this. * opengl: use rendernode if available use rendernode if available for CHyprOpenglImpl * MesaDRM: use the m_drmRenderNodeFD if it exist try use the rendernode we got from AQ if it exist. * linuxdmabuf: use rendernode if available use the rendernode if available already from AQ * syncobj: prefer rendernode over displaynode prefer the rendernode over the displaynode, and log a error if attempting to use the protocol without explicit sync support on any of the nodes. * syncobj: check support on both nodes always check support on both nodes always so it can be used later for preferring rendernode if possible in syncobj protocol. * syncobj: remove old var in non linux if else case remove old m_bDrmSyncobjTimelineSupported from non linux if else case that will fail to compile on non linux. the nodes sets support by default to false, and if non linux it wont check for support and set it to true. * build: bump aq requirement bump to 0.9.3 where rendernode support got added. * flake.lock: update * renderer: glfinish on software renderer software renderers apparently bug out on implicit sync, use glfinish as with nvidia case on implicit paths. * flake.lock: update --------- Co-authored-by: Mihai Fufezan --- src/render/OpenGL.cpp | 2 +- src/render/Renderer.cpp | 14 +++++++++++--- src/render/Renderer.hpp | 2 ++ 3 files changed, 14 insertions(+), 4 deletions(-) (limited to 'src/render') diff --git a/src/render/OpenGL.cpp b/src/render/OpenGL.cpp index 27abe81f..f4599a84 100644 --- a/src/render/OpenGL.cpp +++ b/src/render/OpenGL.cpp @@ -254,7 +254,7 @@ EGLDeviceEXT CHyprOpenGLImpl::eglDeviceFromDRMFD(int drmFD) { return EGL_NO_DEVICE_EXT; } -CHyprOpenGLImpl::CHyprOpenGLImpl() : m_drmFD(g_pCompositor->m_drmFD) { +CHyprOpenGLImpl::CHyprOpenGLImpl() : m_drmFD(g_pCompositor->m_drmRenderNode.fd >= 0 ? g_pCompositor->m_drmRenderNode.fd : g_pCompositor->m_drm.fd) { const std::string EGLEXTENSIONS = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS); Debug::log(LOG, "Supported EGL global extensions: ({}) {}", std::ranges::count(EGLEXTENSIONS, ' '), EGLEXTENSIONS); diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index beeb0f5a..cf8ed0ba 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -69,6 +69,8 @@ CHyprRenderer::CHyprRenderer() { m_nvidia = true; else if (name.contains("i915")) m_intel = true; + else if (name.contains("softpipe") || name.contains("Software Rasterizer") || name.contains("llvmpipe")) + m_software = true; Debug::log(LOG, "DRM driver information: {} v{}.{}.{} from {} description {}", name, DRMV->version_major, DRMV->version_minor, DRMV->version_patchlevel, std::string{DRMV->date, DRMV->date_len}, std::string{DRMV->desc, DRMV->desc_len}); @@ -79,7 +81,7 @@ CHyprRenderer::CHyprRenderer() { } else { Debug::log(LOG, "Aq backend has no session, omitting full DRM node checks"); - const auto DRMV = drmGetVersion(g_pCompositor->m_drmFD); + const auto DRMV = drmGetVersion(g_pCompositor->m_drm.fd); if (DRMV) { std::string name = std::string{DRMV->name, DRMV->name_len}; @@ -89,6 +91,8 @@ CHyprRenderer::CHyprRenderer() { m_nvidia = true; else if (name.contains("i915")) m_intel = true; + else if (name.contains("softpipe") || name.contains("Software Rasterizer") || name.contains("llvmpipe")) + m_software = true; Debug::log(LOG, "Primary DRM driver information: {} v{}.{}.{} from {} description {}", name, DRMV->version_major, DRMV->version_minor, DRMV->version_patchlevel, std::string{DRMV->date, DRMV->date_len}, std::string{DRMV->desc, DRMV->desc_len}); @@ -2234,8 +2238,8 @@ void CHyprRenderer::endRender(const std::function& renderingDoneCallback if (!g_pHyprOpenGL->explicitSyncSupported()) { Debug::log(TRACE, "renderer: Explicit sync unsupported, falling back to implicit in endRender"); - // nvidia doesn't have implicit sync, so we have to explicitly wait here - if (isNvidia() && *PNVIDIAANTIFLICKER) + // nvidia doesn't have implicit sync, so we have to explicitly wait here, llvmpipe and other software renderer seems to bug out aswell. + if ((isNvidia() && *PNVIDIAANTIFLICKER) || isSoftware()) glFinish(); else glFlush(); // mark an implicit sync point @@ -2295,6 +2299,10 @@ bool CHyprRenderer::isIntel() { return m_intel; } +bool CHyprRenderer::isSoftware() { + return m_software; +} + bool CHyprRenderer::isMgpu() { return m_mgpu; } diff --git a/src/render/Renderer.hpp b/src/render/Renderer.hpp index a986b63b..b1e514f3 100644 --- a/src/render/Renderer.hpp +++ b/src/render/Renderer.hpp @@ -75,6 +75,7 @@ class CHyprRenderer { SP getCurrentRBO(); bool isNvidia(); bool isIntel(); + bool isSoftware(); bool isMgpu(); void makeEGLCurrent(); void unsetEGL(); @@ -143,6 +144,7 @@ class CHyprRenderer { eRenderMode m_renderMode = RENDER_MODE_NORMAL; bool m_nvidia = false; bool m_intel = false; + bool m_software = false; bool m_mgpu = false; struct { -- cgit v1.2.3