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

Revert "Fix buffer swap assert"

Browse source 
This reverts commit be01ba0ae7.

See: https://mail.kde.org/pipermail/kwin/2020-January/002999.html
This commit is contained in:
Roman Gilg 2020-01-09 18:05:52 +01:00
parent a5c2f23e92
commit 2dabd0b112
1 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
composite.cpp
View file

@ -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();
}