mirror/Hyprland
3
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2026-02-05 02:25:31 +00:00
Code Issues Projects Releases Wiki Activity

renderer: add render:non_shader_cm and fixes (#11900)

Browse Source
This commit is contained in:
UjinT34
2025-10-02 13:05:54 +03:00
committed by GitHub
parent c467bb2640
commit 3bcfa94ee4
5 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/config/ConfigDescriptions.hpp
View File

@ -1524,6 +1524,12 @@ inline static const std::vector<SConfigOptionDescription> CONFIG_OPTIONS = {
.type = CONFIG_OPTION_BOOL,
.data = SConfigOptionDescription::SBoolData{false},
},
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",
.type = CONFIG_OPTION_CHOICE,
.data = SConfigOptionDescription::SChoiceData{0, "disable,always,ondemand,ignore"},
},
/*
* cursor:

1
src/config/ConfigManager.cpp
View File

@ -777,6 +777,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("ecosystem:no_update_news", Hyprlang::INT{0});
registerConfigVar("ecosystem:no_donation_nag", Hyprlang::INT{0});

16
src/helpers/Monitor.cpp
View File

@ -534,7 +534,8 @@ void CMonitor::applyCMType(eCMType cmType) {
if (oldImageDescription != m_imageDescription) {
m_imageDescription.updateId();
PROTO::colorManagement->onMonitorImageDescriptionChanged(m_self);
if (PROTO::colorManagement)
PROTO::colorManagement->onMonitorImageDescriptionChanged(m_self);
}
}
@ -1701,6 +1702,7 @@ uint16_t CMonitor::isDSBlocked(bool full) {
uint16_t reasons = 0;
static auto PDIRECTSCANOUT = CConfigValue<Hyprlang::INT>("render:direct_scanout");
static auto PPASS = CConfigValue<Hyprlang::INT>("render:cm_fs_passthrough");
static auto PNONSHADER = CConfigValue<Hyprlang::INT>("render:non_shader_cm");
if (*PDIRECTSCANOUT == 0) {
reasons |= DS_BLOCK_USER;
@ -1770,7 +1772,8 @@ uint16_t CMonitor::isDSBlocked(bool full) {
return reasons;
}
if (!canNoShaderCM() && (!inHDR() || (PSURFACE->m_colorManagement.valid() && PSURFACE->m_colorManagement->isWindowsScRGB())) && *PPASS != 1)
if (needsCM() && *PNONSHADER != CM_NS_IGNORE && !canNoShaderCM() && (!inHDR() || (PSURFACE->m_colorManagement.valid() && PSURFACE->m_colorManagement->isWindowsScRGB())) &&
*PPASS != 1)
reasons |= DS_BLOCK_CM;
return reasons;
@ -1989,11 +1992,16 @@ std::optional<NColorManagement::SImageDescription> CMonitor::getFSImageDescripti
}
bool CMonitor::needsCM() {
return getFSImageDescription() != m_imageDescription;
const auto SRC_DESC = getFSImageDescription();
return SRC_DESC.has_value() && SRC_DESC.value() != m_imageDescription;
}
// TODO support more drm properties
bool CMonitor::canNoShaderCM() {
static auto PNONSHADER = CConfigValue<Hyprlang::INT>("render:non_shader_cm");
if (*PNONSHADER == CM_NS_DISABLE)
return false;
const auto SRC_DESC = getFSImageDescription();
if (!SRC_DESC.has_value())
return false;
@ -2006,7 +2014,7 @@ bool CMonitor::canNoShaderCM() {
// only primaries differ
if (SRC_DESC->transferFunction == m_imageDescription.transferFunction && SRC_DESC->transferFunctionPower == m_imageDescription.transferFunctionPower &&
SRC_DESC->luminances == m_imageDescription.luminances && SRC_DESC->masteringLuminances == m_imageDescription.masteringLuminances &&
(!inHDR() || SRC_DESC->luminances == m_imageDescription.luminances) && SRC_DESC->masteringLuminances == m_imageDescription.masteringLuminances &&
SRC_DESC->maxCLL == m_imageDescription.maxCLL && SRC_DESC->maxFALL == m_imageDescription.maxFALL)
return true;

7
src/protocols/types/ColorManagement.hpp
View File

@ -11,6 +11,13 @@
#define HLG_MAX_LUMINANCE 1000.0
namespace NColorManagement {
enum eNoShader : uint8_t {
CM_NS_DISABLE = 0,
CM_NS_ALWAYS = 1,
CM_NS_ONDEMAND = 2,
CM_NS_IGNORE = 3,
};
enum ePrimaries : uint8_t {
CM_PRIMARIES_SRGB = 1,
CM_PRIMARIES_PAL_M = 2,

9
src/render/Renderer.cpp
View File

@ -1483,9 +1483,10 @@ static hdr_output_metadata createHDRMetadata(SImageDescription settings, S
}
bool CHyprRenderer::commitPendingAndDoExplicitSync(PHLMONITOR pMonitor) {
static auto PCT = CConfigValue<Hyprlang::INT>("render:send_content_type");
static auto PPASS = CConfigValue<Hyprlang::INT>("render:cm_fs_passthrough");
static auto PAUTOHDR = CConfigValue<Hyprlang::INT>("render:cm_auto_hdr");
static auto PCT = CConfigValue<Hyprlang::INT>("render:send_content_type");
static auto PPASS = CConfigValue<Hyprlang::INT>("render:cm_fs_passthrough");
static auto PAUTOHDR = CConfigValue<Hyprlang::INT>("render:cm_auto_hdr");
static auto PNONSHADER = CConfigValue<Hyprlang::INT>("render:non_shader_cm");
static bool needsHDRupdate = false;
@ -1570,7 +1571,7 @@ 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()) {
if (!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;