From 2dabd0b1126114a72f50a6470fc527a86e455739 Mon Sep 17 00:00:00 2001 From: Roman Gilg Date: Thu, 9 Jan 2020 18:05:52 +0100 Subject: [PATCH] Revert "Fix buffer swap assert" This reverts commit be01ba0ae7c6c87588cfb612201541ab235a2875. See: https://mail.kde.org/pipermail/kwin/2020-January/002999.html --- composite.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/composite.cpp b/composite.cpp index 2b4943ead5..2c3870fa3f 100644 --- a/composite.cpp +++ b/composite.cpp @@ -603,6 +603,7 @@ void Compositor::timerEvent(QTimerEvent *te) void Compositor::aboutToSwapBuffers() { Q_ASSERT(!m_bufferSwapPending); + m_bufferSwapPending = true; } @@ -711,16 +712,7 @@ void Compositor::performCompositing() if (m_framesToTestForSafety > 0 && (m_scene->compositingType() & OpenGLCompositing)) { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PreFrame); } - - Q_ASSERT(!m_bufferSwapPending); - - // Start the actual painting process. m_timeSinceLastVBlank = m_scene->paint(repaints, windows); - - // TODO: In case we have swap events the buffer swap should now be pending, but this is not - // always the case on X11 standalone platform. Look into that. -// Q_ASSERT(m_scene->hasSwapEvent() ^ !m_bufferSwapPending); - if (m_framesToTestForSafety > 0) { if (m_scene->compositingType() & OpenGLCompositing) { kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFrame); @@ -749,6 +741,7 @@ void Compositor::performCompositing() // is called the next time. If there would be nothing pending, it will not restart the timer and // scheduleRepaint() would restart it again somewhen later, called from functions that // would again add something pending. + Q_ASSERT(!m_bufferSwapPending); scheduleRepaint(); }