yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix directScanout getting shadowed

Browse source 
Amends 7ab825cba1.

This shadow "directScanout" variable breaks

    if (!directScanout) {
        if (!m_backend->present(output, frame)) {
            m_backend->repairPresentation(output);
        }
    }

which can result in present() function getting called twice with the
same `OutputFrame` object: first, at line 359, and the second time at
line 386. That, in its turn, would queue two drm commit objects with
the same OutputFrame and then the behavior is undefined.
This commit is contained in:
Vlad Zahorodnii 2024-08-25 15:41:00 +00:00
parent 5276801d5e
commit 1e7cfc1d19
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/compositor_wayland.cpp
View file

@ -336,7 +336,6 @@ void WaylandCompositor::composite(RenderLoop *renderLoop)
frame->setPresentationMode(tearing ? PresentationMode::Async : PresentationMode::VSync); frame->setPresentationMode(tearing ? PresentationMode::Async : PresentationMode::VSync);
} }
bool directScanout = false;
const uint32_t planeCount = 1; const uint32_t planeCount = 1;
if (const auto scanoutCandidates = superLayer->delegate()->scanoutCandidates(planeCount + 1); !scanoutCandidates.isEmpty()) { if (const auto scanoutCandidates = superLayer->delegate()->scanoutCandidates(planeCount + 1); !scanoutCandidates.isEmpty()) {
const auto sublayers = superLayer->sublayers(); const auto sublayers = superLayer->sublayers();