cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hdr: fix overrides and missing edid hdr metadata (#11476)

Browse source
This commit is contained in:
UjinT34 2025-08-19 21:28:52 +03:00 • committed by GitHub
parent 1a0ed00f74
commit 1d67987459
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/helpers/Monitor.cpp
View file

@ -1669,16 +1669,17 @@ bool CMonitor::supportsHDR() {
return supportsWideColor() && (m_supportsHDR || (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->supportsPQ : false));
}
float CMonitor::minLuminance() {
return m_minLuminance >= 0 ? m_minLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMinLuminance : 0);
float CMonitor::minLuminance(float defaultValue) {
return m_minLuminance >= 0 ? m_minLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMinLuminance : defaultValue);
}
int CMonitor::maxLuminance() {
return m_maxLuminance >= 0 ? m_maxLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMaxLuminance : 80);
int CMonitor::maxLuminance(int defaultValue) {
return m_maxLuminance >= 0 ? m_maxLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredContentMaxLuminance : defaultValue);
}
int CMonitor::maxAvgLuminance() {
return m_maxAvgLuminance >= 0 ? m_maxAvgLuminance : (m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredMaxFrameAverageLuminance : 80);
int CMonitor::maxAvgLuminance(int defaultValue) {
return m_maxAvgLuminance >= 0 ? m_maxAvgLuminance :
(m_output->parsedEDID.hdrMetadata.has_value() ? m_output->parsedEDID.hdrMetadata->desiredMaxFrameAverageLuminance : defaultValue);
}
CMonitorState::CMonitorState(CMonitor* owner) : m_owner(owner) {

6
src/helpers/Monitor.hpp
View file

@ -245,9 +245,9 @@ class CMonitor {
bool supportsWideColor();
bool supportsHDR();
float minLuminance();
int maxLuminance();
int maxAvgLuminance();
float minLuminance(float defaultValue = 0);
int maxLuminance(int defaultValue = 80);
int maxAvgLuminance(int defaultValue = 80);
bool m_enabled = false;
bool m_renderingInitPassed = false;