mirror/Hyprland
3
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland.git synced 2026-08-18 11:02:10 +00:00
Code Issues Projects Releases Wiki Activity

hdr: reset surface metadata on change (#15598)

Browse Source 
if we dont reset surface metadata, the monitor is stuck in using the
surfaces metadata, and doesnt restore back ours. meaning after DS and
gaming and returning, colors stay stuck fringed until a new metadata
modeset.

however this causes a modeset on returning that isnt wanted if a
notification temporarly shows and vanishes. but a future PR in perhaps
using a timer if DS reenters in a short bit we dont care about the notif
fringing?

better then leaving the monitor permanently wrong colors.
This commit is contained in:
Tom Englund
2026-08-04 22:14:55 +02:00
committed by GitHub
parent 10d320fde6
commit fa45db49c6
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/output/Monitor.hpp
View File

@ -358,7 +358,8 @@ namespace Monitor {
bool m_renderingInitPassed = false;
PHLWINDOWREF m_previousFSWindow;
bool m_needsHDRupdate = false;
bool m_needsHDRupdate = false;
bool m_hdrMetadataFromSurface = false;
std::optional<dev_t> m_cachedAllocatorDRMDev;
std::optional<dev_t> m_cachedCompositorDRMDev;

8
src/render/Renderer.cpp
View File

@ -2335,6 +2335,7 @@ void IHyprRenderer::handleFullscreenSettings(PHLMONITOR pMonitor) {
if (needsHdrMetadataUpdate) {
Log::logger->log(Log::INFO, "[CM] Updating HDR metadata from surface");
pMonitor->m_output->state->setHDRMetadata(SURF->m_colorManagement->hdrMetadata());
pMonitor->m_hdrMetadataFromSurface = true;
}
hdrIsHandled = true;
pMonitor->m_needsHDRupdate = false;
@ -2347,8 +2348,10 @@ void IHyprRenderer::handleFullscreenSettings(PHLMONITOR pMonitor) {
wantHDR = configuredHDR;
if (!hdrIsHandled) {
if (pMonitor->inHDR() != wantHDR) {
if (*PAUTOHDR && !(pMonitor->inHDR() && configuredHDR)) {
const bool HDR_CHANGED = pMonitor->inHDR() != wantHDR;
if (HDR_CHANGED || pMonitor->m_hdrMetadataFromSurface) {
if (HDR_CHANGED && *PAUTOHDR && !(pMonitor->inHDR() && configuredHDR)) {
// modify or restore monitor image description for auto-hdr
// FIXME ok for now, will need some other logic if monitor image description can be modified some other way
const auto targetCM = wantHDR ? (*PAUTOHDR == 2 ? NCMType::CM_HDR_EDID : NCMType::CM_HDR) : pMonitor->m_cmType;
@ -2359,6 +2362,7 @@ void IHyprRenderer::handleFullscreenSettings(PHLMONITOR pMonitor) {
}
Log::logger->log(Log::INFO, wantHDR ? "[CM] Updating HDR metadata from monitor" : "[CM] Restoring SDR mode");
pMonitor->m_output->state->setHDRMetadata(wantHDR ? createHDRMetadata(pMonitor->m_imageDescription->value(), pMonitor) : NO_HDR_METADATA);
pMonitor->m_hdrMetadataFromSurface = false;
}
pMonitor->m_needsHDRupdate = true;
}