Index: composite.h
===================================================================
--- composite.h
+++ composite.h
@@ -239,7 +239,7 @@
     Scene *m_scene;
     bool m_bufferSwapPending;
     bool m_composeAtSwapCompletion;
-    int m_framesToTestForSafety = 30;
+    int m_framesToTestForSafety = 3;
 
     KWIN_SINGLETON_VARIABLE(Compositor, s_compositor)
 };
Index: composite.cpp
===================================================================
--- composite.cpp
+++ composite.cpp
@@ -745,9 +745,9 @@
             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;
 
Index: plugins/platforms/x11/standalone/x11_platform.cpp
===================================================================
--- plugins/platforms/x11/standalone/x11_platform.cpp
+++ plugins/platforms/x11/standalone/x11_platform.cpp
@@ -222,9 +222,7 @@
                     group.sync();
                     qFatal("Freeze in OpenGL initialization detected");
                 }, Qt::DirectConnection);
-        }
-        else
-        {
+        } else {
             Q_ASSERT(m_openGLFreezeProtection);
             QMetaObject::invokeMethod(m_openGLFreezeProtection, "start", Qt::QueuedConnection);
         }