diff options
author | Ikalco <[email protected]> | 2024-08-28 08:07:13 -0500 |
---|---|---|
committer | GitHub <[email protected]> | 2024-08-28 15:07:13 +0200 |
commit | 98e99cd03df5b4421f72f2a3f2d7de53f8261f1f (patch) | |
tree | 903c0be590279235b5c322f8b115cfd0331168ec /src/helpers/Monitor.cpp | |
parent | 8210a1d7ac38f6af76ccbb831dc1d62b1ebc53db (diff) | |
download | Hyprland-98e99cd03df5b4421f72f2a3f2d7de53f8261f1f.tar.gz Hyprland-98e99cd03df5b4421f72f2a3f2d7de53f8261f1f.zip |
renderer: ensure buffer format on commit (#7556)
Diffstat (limited to 'src/helpers/Monitor.cpp')
-rw-r--r-- | src/helpers/Monitor.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp index d81ccb3d..2b8404ee 100644 --- a/src/helpers/Monitor.cpp +++ b/src/helpers/Monitor.cpp @@ -915,17 +915,20 @@ CMonitorState::~CMonitorState() { } void CMonitorState::ensureBufferPresent() { - if (!m_pOwner->output->state->state().enabled) { + const auto STATE = m_pOwner->output->state->state(); + if (!STATE.enabled) { Debug::log(TRACE, "CMonitorState::ensureBufferPresent: Ignoring, monitor is not enabled"); return; } - if (m_pOwner->output->state->state().buffer) - return; + if (STATE.buffer) { + if (const auto params = STATE.buffer->dmabuf(); params.success && params.format == m_pOwner->drmFormat) + return; + } // this is required for modesetting being possible and might be missing in case of first tests in the renderer // where we test modes and buffers - Debug::log(LOG, "CMonitorState::ensureBufferPresent: no buffer, attaching one from the swapchain for modeset being possible"); + Debug::log(LOG, "CMonitorState::ensureBufferPresent: no buffer or mismatched format, attaching one from the swapchain for modeset being possible"); m_pOwner->output->state->setBuffer(m_pOwner->output->swapchain->next(nullptr)); m_pOwner->output->swapchain->rollback(); // restore the counter, don't advance the swapchain } |