From f55e9ff471a29eb4c8f0e1558bc5b0592686ddf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B8rgen=20Lind?= Date: Fri, 25 Mar 2011 08:23:53 +0100 Subject: Lighthouse: Wayland: Print out what platformbackend we are using --- .../wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp | 4 ++++ .../gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.cpp | 1 + .../gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.h | 1 - .../gl_integration/xpixmap_glx/qwaylandxpixmapglxintegration.cpp | 3 +++ 4 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp index 1f77064..942e591 100644 --- a/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp +++ b/src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp @@ -4,12 +4,16 @@ #include "qwaylandeglwindow.h" +#include + QWaylandEglIntegration::QWaylandEglIntegration(struct wl_display *waylandDisplay) : mWaylandDisplay(waylandDisplay) , mNativeEglDisplay(wl_egl_display_create(mWaylandDisplay)) { + qDebug() << "Using Wayland-EGL"; } + QWaylandEglIntegration::~QWaylandEglIntegration() { eglTerminate(mEglDisplay); diff --git a/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.cpp b/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.cpp index a121900..8ccfc67 100644 --- a/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.cpp +++ b/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.cpp @@ -8,6 +8,7 @@ QWaylandXPixmapEglIntegration::QWaylandXPixmapEglIntegration(QWaylandDisplay *di : QWaylandGLIntegration() , mWaylandDisplay(display) { + qDebug() << "Using Wayland XPixmap-EGL"; char *display_name = getenv("DISPLAY"); mDisplay = XOpenDisplay(display_name); mScreen = XDefaultScreen(mDisplay); diff --git a/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.h b/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.h index 534494b..9e7cb66 100644 --- a/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.h +++ b/src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.h @@ -12,7 +12,6 @@ #include #include -//#include + QWaylandXPixmapGLXIntegration::QWaylandXPixmapGLXIntegration(QWaylandDisplay * waylandDispaly) : QWaylandGLIntegration() , mWaylandDisplay(waylandDispaly) { + qDebug() << "Using Wayland XPixmap-GLX"; char *display_name = getenv("DISPLAY"); mDisplay = XOpenDisplay(display_name); mScreen = XDefaultScreen(mDisplay); -- cgit v0.12