From 5cef2f44fed662c8cac256877b0a7141b9ce2440 Mon Sep 17 00:00:00 2001 From: Ikalco <73481042+ikalco@users.noreply.github.com> Date: Mon, 17 Mar 2025 07:06:58 -0500 Subject: [PATCH] renderer: allow commits when buffer is unchanged but cursor changed (#9648) --- src/helpers/Monitor.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/helpers/Monitor.cpp b/src/helpers/Monitor.cpp index 710224250..9fd4d35d2 100644 --- a/src/helpers/Monitor.cpp +++ b/src/helpers/Monitor.cpp @@ -1355,9 +1355,8 @@ bool CMonitor::attemptDirectScanout() { Debug::log(TRACE, "attemptDirectScanout: surface {:x} passed, will attempt, buffer {}", (uintptr_t)PSURFACE.get(), (uintptr_t)PSURFACE->current.buffer->buffer.get()); - auto PBUFFER = PSURFACE->current.buffer->buffer.lock(); - if (PBUFFER == output->state->state().buffer) - return true; + auto PBUFFER = PSURFACE->current.buffer->buffer.lock(); + bool SAMEBUFFER = PBUFFER == output->state->state().buffer; // FIXME: make sure the buffer actually follows the available scanout dmabuf formats // and comes from the appropriate device. This may implode on multi-gpu!! @@ -1371,7 +1370,8 @@ bool CMonitor::attemptDirectScanout() { drmFormat = params.format; } - output->state->setBuffer(PBUFFER); + if (!SAMEBUFFER) + output->state->setBuffer(PBUFFER); output->state->setPresentationMode(tearingState.activelyTearing ? Aquamarine::eOutputPresentationMode::AQ_OUTPUT_PRESENTATION_IMMEDIATE : Aquamarine::eOutputPresentationMode::AQ_OUTPUT_PRESENTATION_VSYNC); @@ -1426,7 +1426,7 @@ bool CMonitor::attemptDirectScanout() { Debug::log(LOG, "Entered a direct scanout to {:x}: \"{}\"", (uintptr_t)PCANDIDATE.get(), PCANDIDATE->m_szTitle); } - if (!PBUFFER->lockedByBackend || PBUFFER->hlEvents.backendRelease) + if (!PBUFFER->lockedByBackend || PBUFFER->hlEvents.backendRelease || SAMEBUFFER) return true; // lock buffer while DRM/KMS is using it, then release it when page flip happens since DRM/KMS should be done by then