From 64e0b693c756be9aa8ea5d7dfe274216600b884c Mon Sep 17 00:00:00 2001 From: Xaver Hugl Date: Thu, 11 Apr 2024 21:25:16 +0200 Subject: [PATCH] core/output: remove direct scanout inhibition It's not used anywhere --- src/compositor.cpp | 2 +- src/core/output.cpp | 15 --------------- src/core/output.h | 6 ------ 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/compositor.cpp b/src/compositor.cpp index 104e1206e6..d263c5440d 100644 --- a/src/compositor.cpp +++ b/src/compositor.cpp @@ -184,7 +184,7 @@ void Compositor::composite(RenderLoop *renderLoop) const bool scanoutPossible = std::none_of(sublayers.begin(), sublayers.end(), [](RenderLayer *sublayer) { return sublayer->isVisible(); }); - if (scanoutPossible && !output->directScanoutInhibited()) { + if (scanoutPossible) { directScanout = primaryLayer->scanout(scanoutCandidate); } } diff --git a/src/core/output.cpp b/src/core/output.cpp index e8269e553f..3b6b6a3aaa 100644 --- a/src/core/output.cpp +++ b/src/core/output.cpp @@ -401,21 +401,6 @@ bool Output::isInternal() const return m_information.internal; } -void Output::inhibitDirectScanout() -{ - m_directScanoutCount++; -} - -void Output::uninhibitDirectScanout() -{ - m_directScanoutCount--; -} - -bool Output::directScanoutInhibited() const -{ - return m_directScanoutCount; -} - std::chrono::milliseconds Output::dimAnimationTime() { // See kscreen.kcfg diff --git a/src/core/output.h b/src/core/output.h index 5ddc5d7de5..4a6f3eb4cb 100644 --- a/src/core/output.h +++ b/src/core/output.h @@ -290,11 +290,6 @@ public: */ virtual RenderLoop *renderLoop() const = 0; - void inhibitDirectScanout(); - void uninhibitDirectScanout(); - - bool directScanoutInhibited() const; - /** * @returns the configured time for an output to dim * @@ -477,7 +472,6 @@ protected: State m_state; Information m_information; QUuid m_uuid; - int m_directScanoutCount = 0; int m_refCount = 1; };