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

Fix build without Wayland, but with HAVE_X11_XCB

Browse source 
Build error in SceneOpenGL.
This commit is contained in:
Martin Gräßlin 2015-03-24 10:43:48 +01:00
parent d7fd252484
commit 2d1622ea09
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scene_opengl.cpp
View file

@ -30,18 +30,20 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#ifdef KWIN_HAVE_EGL #ifdef KWIN_HAVE_EGL
#include "eglonxbackend.h" #include "eglonxbackend.h"
// for Wayland // for Wayland
#if HAVE_WAYLAND
#if HAVE_WAYLAND_EGL #if HAVE_WAYLAND_EGL
#include "egl_wayland_backend.h" #include "egl_wayland_backend.h"
#include "wayland_backend.h" #include "wayland_backend.h"
#include "wayland_server.h" #include "wayland_server.h"
#endif #endif // HAVE_WAYLAND_EGL
#if HAVE_X11_XCB #if HAVE_X11_XCB
#include "x11windowed_backend.h" #include "x11windowed_backend.h"
#endif #endif // HAVE_X11_XCB
#endif #endif // HAVE_WAYLAND
#endif // KWIN_HAVE_EGL
#ifndef KWIN_HAVE_OPENGLES #ifndef KWIN_HAVE_OPENGLES
#include "glxbackend.h" #include "glxbackend.h"
#endif #endif // KWIN_HAVE_OPENGLES
#include <kwinglcolorcorrection.h> #include <kwinglcolorcorrection.h>
#include <kwinglplatform.h> #include <kwinglplatform.h>
@ -499,23 +501,26 @@ SceneOpenGL *SceneOpenGL::createScene(QObject *parent)
break; break;
case EglPlatformInterface: case EglPlatformInterface:
#ifdef KWIN_HAVE_EGL #ifdef KWIN_HAVE_EGL
#if HAVE_WAYLAND
if (kwinApp()->shouldUseWaylandForCompositing()) { if (kwinApp()->shouldUseWaylandForCompositing()) {
#if HAVE_WAYLAND_EGL #if HAVE_WAYLAND_EGL
if (Wayland::WaylandBackend *b = dynamic_cast<Wayland::WaylandBackend*>(waylandServer()->backend())) { if (Wayland::WaylandBackend *b = dynamic_cast<Wayland::WaylandBackend*>(waylandServer()->backend())) {
backend = new EglWaylandBackend(b); backend = new EglWaylandBackend(b);
} }
#endif #endif // HAVE_WAYLAND_EGL
#if HAVE_X11_XCB #if HAVE_X11_XCB
if (!backend) { if (!backend) {
if (X11WindowedBackend *b = dynamic_cast<X11WindowedBackend*>(waylandServer()->backend())) { if (X11WindowedBackend *b = dynamic_cast<X11WindowedBackend*>(waylandServer()->backend())) {
backend = new EglOnXBackend(b); backend = new EglOnXBackend(b);
} }
} }
#endif #endif // HAVE_X11_XCB
} else { } else
#endif // HAVE_WAYLAND
{
backend = new EglOnXBackend(); backend = new EglOnXBackend();
} }
#endif #endif // KWIN_HAVE_EGL
break; break;
default: default:
// no backend available // no backend available