[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kwin] /: Create SyncManager only when using X11
From:       Martin_Flöser <null () kde ! org>
Date:       2017-09-01 16:06:14
Message-ID: E1dnoSU-0008Ko-4g () code ! kde ! org
[Download RAW message or body]

Git commit 3e0e26204f4c4dc28fadef9eac557145d45f5137 by Martin Flöser.
Committed on 01/09/2017 at 16:05.
Pushed by graesslin into branch 'master'.

Create SyncManager only when using X11

Summary:
The SyncManager is highly X11 dependent and doesn't make much sense on
Wayland. It should already be guarded by the check for
GL_EXT_x11_sync_object, but better be safe than sorry, so explicit check
for on X11.

Reviewers: #kwin, #plasma

Subscribers: plasma-devel, kwin

Tags: #kwin

Differential Revision: https://phabricator.kde.org/D7514

M  +1    -1    scene_opengl.cpp

https://commits.kde.org/kwin/3e0e26204f4c4dc28fadef9eac557145d45f5137

diff --git a/scene_opengl.cpp b/scene_opengl.cpp
index 991b6ffef..74fa0574a 100644
--- a/scene_opengl.cpp
+++ b/scene_opengl.cpp
@@ -428,7 +428,7 @@ SceneOpenGL::SceneOpenGL(OpenGLBackend *backend, QObject *parent)
         ? hasGLVersion(3, 0)
         : hasGLVersion(3, 2) || hasGLExtension("GL_ARB_sync");
 
-    if (hasGLExtension("GL_EXT_x11_sync_object") && haveSyncObjects) {
+    if (hasGLExtension("GL_EXT_x11_sync_object") && haveSyncObjects && \
kwinApp()->operationMode() == Application::OperationModeX11) {  const QByteArray \
useExplicitSync = qgetenv("KWIN_EXPLICIT_SYNC");  
         if (useExplicitSync != "0") {


[prev in list] [next in list] [prev in thread] [next in thread]