File 0007-Only-call-PostLastGuardedFrame-when-OpenGLCompositin.patch of Package kwin5
From 9b51560ca83bd9790c633f3a90019b88c45d8fe0 Mon Sep 17 00:00:00 2001
From: Antonio Larrosa <larrosa@kde.org>
Date: Mon, 24 Oct 2016 17:14:32 +0200
Subject: [PATCH 7/7] Only call PostLastGuardedFrame when OpenGLCompositing is
set
And a small coding style change in bracets
---
composite.cpp | 4 ++--
plugins/platforms/x11/standalone/x11_platform.cpp | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/composite.cpp b/composite.cpp
index 573e7a6..41b948e 100644
--- a/composite.cpp
+++ b/composite.cpp
@@ -745,9 +745,9 @@ void Compositor::performCompositing()
kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostFrame);
}
m_framesToTestForSafety--;
- if (m_framesToTestForSafety == 0) {
+ if (m_framesToTestForSafety == 0 && (m_scene->compositingType() & OpenGLCompositing)) {
kwinApp()->platform()->createOpenGLSafePoint(Platform::OpenGLSafePoint::PostLastGuardedFrame);
- }
+ }
}
m_timeSinceStart += m_timeSinceLastVBlank;
diff --git a/plugins/platforms/x11/standalone/x11_platform.cpp b/plugins/platforms/x11/standalone/x11_platform.cpp
index 88b37ea..05bdd39 100644
--- a/plugins/platforms/x11/standalone/x11_platform.cpp
+++ b/plugins/platforms/x11/standalone/x11_platform.cpp
@@ -222,9 +222,7 @@ void X11StandalonePlatform::createOpenGLSafePoint(OpenGLSafePoint safePoint)
group.sync();
qFatal("Freeze in OpenGL initialization detected");
}, Qt::DirectConnection);
- }
- else
- {
+ } else {
Q_ASSERT(m_openGLFreezeProtection);
QMetaObject::invokeMethod(m_openGLFreezeProtection, "start", Qt::QueuedConnection);
}
--
2.10.1