Scott JonesandClaude Opus 5.5
09ef472bcb
Carry a v0.56.2 backport of hyprwm/Hyprland#16343 so display-only KMS drivers paired with llvmpipe are classified as software rendering. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
50 lines
2.5 KiB
Diff
50 lines
2.5 KiB
Diff
From: Scott Jones <scottajones@gmail.com>
|
|
Subject: [PATCH] render: detect software rendering from the GL renderer (0.56.2 backport)
|
|
|
|
Backport-of: 61d0ff60a7547d49229714a68b7ca9c0b6658727
|
|
Upstream-PR: https://github.com/hyprwm/Hyprland/pull/16343
|
|
Co-authored-by: Eryk Wieliczko <44800858+erykwieliczko@users.noreply.github.com>
|
|
|
|
Adapt constructor and logger-context differences against v0.56.2 while
|
|
preserving the original GL classification behavior. Remove this backport
|
|
once the packaged upstream version includes this behavior.
|
|
|
|
--- a/src/render/GLRenderer.cpp
|
|
+++ b/src/render/GLRenderer.cpp
|
|
@@ -36,7 +36,14 @@
|
|
#include <xf86drm.h>
|
|
}
|
|
|
|
-CHyprGLRenderer::CHyprGLRenderer() : IHyprRenderer(), m_elementRenderer(makeUnique<CGLElementRenderer>()) {}
|
|
+CHyprGLRenderer::CHyprGLRenderer() : IHyprRenderer(), m_elementRenderer(makeUnique<CGLElementRenderer>()) {
|
|
+ // KMS can be display-only; classify the active GL renderer instead of the DRM driver.
|
|
+ g_pHyprOpenGL->makeEGLCurrent();
|
|
+ if (const auto* renderer = rc<const char*>(glGetString(GL_RENDERER))) {
|
|
+ const std::string name{renderer};
|
|
+ m_software = name.contains("llvmpipe") || name.contains("softpipe") || name.contains("Software Rasterizer");
|
|
+ }
|
|
+}
|
|
|
|
IHyprRenderer::eType CHyprGLRenderer::type() {
|
|
return RT_GL;
|
|
--- a/src/render/Renderer.cpp
|
|
+++ b/src/render/Renderer.cpp
|
|
@@ -104,8 +104,6 @@
|
|
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;
|
|
|
|
Log::logger->log(Log::DEBUG, "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});
|
|
@@ -126,8 +124,6 @@
|
|
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;
|
|
|
|
Log::logger->log(Log::DEBUG, "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});
|