diff options
| author | UjinT34 <41110182+UjinT34@users.noreply.github.com> | 2025-11-07 18:58:25 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-11-07 15:58:25 +0000 |
| commit | fd50e78bc9a8fa684000a64a76daf3dd0d36721b (patch) | |
| tree | 54f2fcfeff53f8cad6aec9ed0f5808ff3c674ee8 /src | |
| parent | 061981201d09ea3c8a747865ebf1ffe47791342f (diff) | |
render/cm: change non_shader_cm ignore behavior and set default to it (#12210)
Diffstat (limited to 'src')
| -rw-r--r-- | src/config/ConfigDescriptions.hpp | 2 | ||||
| -rw-r--r-- | src/config/ConfigManager.cpp | 2 | ||||
| -rw-r--r-- | src/render/Renderer.cpp | 3 |
3 files changed, 4 insertions, 3 deletions
diff --git a/src/config/ConfigDescriptions.hpp b/src/config/ConfigDescriptions.hpp index 5501339d..926d49ac 100644 --- a/src/config/ConfigDescriptions.hpp +++ b/src/config/ConfigDescriptions.hpp @@ -1544,7 +1544,7 @@ inline static const std::vector<SConfigOptionDescription> CONFIG_OPTIONS = { }, SConfigOptionDescription{ .value = "render:non_shader_cm", - .description = "Enable CM without shader. 0 - disable, 1 - whenever possible, 2 - DS and passthrough only, 3 - don't block DS when non-shader CM isn't available", + .description = "Enable CM without shader. 0 - disable, 1 - whenever possible, 2 - DS and passthrough only, 3 - disable and ignore CM issues", .type = CONFIG_OPTION_CHOICE, .data = SConfigOptionDescription::SChoiceData{0, "disable,always,ondemand,ignore"}, }, diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index 159dabff..d03ad83e 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -781,7 +781,7 @@ CConfigManager::CConfigManager() { registerConfigVar("render:send_content_type", Hyprlang::INT{1}); registerConfigVar("render:cm_auto_hdr", Hyprlang::INT{1}); registerConfigVar("render:new_render_scheduling", Hyprlang::INT{0}); - registerConfigVar("render:non_shader_cm", Hyprlang::INT{2}); + registerConfigVar("render:non_shader_cm", Hyprlang::INT{3}); registerConfigVar("render:cm_sdr_eotf", Hyprlang::INT{0}); registerConfigVar("ecosystem:no_update_news", Hyprlang::INT{0}); diff --git a/src/render/Renderer.cpp b/src/render/Renderer.cpp index 8bb50c38..c13a54d1 100644 --- a/src/render/Renderer.cpp +++ b/src/render/Renderer.cpp @@ -1586,7 +1586,8 @@ bool CHyprRenderer::commitPendingAndDoExplicitSync(PHLMONITOR pMonitor) { pMonitor->m_output->state->setContentType(NContentType::toDRM(FS_WINDOW ? FS_WINDOW->getContentType() : CONTENT_TYPE_NONE)); if (FS_WINDOW != pMonitor->m_previousFSWindow) { - if (!FS_WINDOW || !pMonitor->needsCM() || !pMonitor->canNoShaderCM() || (*PNONSHADER == CM_NS_ONDEMAND && pMonitor->m_lastScanout.expired() && *PPASS != 1)) { + if (*PNONSHADER == CM_NS_IGNORE || !FS_WINDOW || !pMonitor->needsCM() || !pMonitor->canNoShaderCM() || + (*PNONSHADER == CM_NS_ONDEMAND && pMonitor->m_lastScanout.expired() && *PPASS != 1)) { if (pMonitor->m_noShaderCTM) { Debug::log(INFO, "[CM] No fullscreen CTM, restoring previous one"); pMonitor->m_noShaderCTM = false; |