summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJørgen Lind <jorgen.lind@nokia.com>2011-03-25 07:23:53 (GMT)
committerJørgen Lind <jorgen.lind@nokia.com>2011-03-25 07:34:09 (GMT)
commitf55e9ff471a29eb4c8f0e1558bc5b0592686ddf2 (patch)
treef1340e708746bd14512ad83bd555ee85cd47fb42 /src
parent31ca1ee427cce4dadb98e3091504db707346b0bc (diff)
downloadQt-f55e9ff471a29eb4c8f0e1558bc5b0592686ddf2.zip
Qt-f55e9ff471a29eb4c8f0e1558bc5b0592686ddf2.tar.gz
Qt-f55e9ff471a29eb4c8f0e1558bc5b0592686ddf2.tar.bz2
Lighthouse: Wayland: Print out what platformbackend we are using
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/wayland/gl_integration/wayland_egl/qwaylandeglintegration.cpp4
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.cpp1
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xpixmap_egl/qwaylandxpixmapeglintegration.h1
-rw-r--r--src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxintegration.cpp3
4 files changed, 8 insertions, 1 deletions
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 <QtCore/QDebug>
+
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 <X11/Xlib.h>
#include <EGL/egl.h>
-//#include <EGL
class QWaylandXPixmapEglIntegration : public QWaylandGLIntegration
{
diff --git a/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxintegration.cpp b/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxintegration.cpp
index 17593d7..f094946 100644
--- a/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxintegration.cpp
+++ b/src/plugins/platforms/wayland/gl_integration/xpixmap_glx/qwaylandxpixmapglxintegration.cpp
@@ -2,10 +2,13 @@
#include "qwaylandxpixmapglxwindow.h"
+#include <QtCore/QDebug>
+
QWaylandXPixmapGLXIntegration::QWaylandXPixmapGLXIntegration(QWaylandDisplay * waylandDispaly)
: QWaylandGLIntegration()
, mWaylandDisplay(waylandDispaly)
{
+ qDebug() << "Using Wayland XPixmap-GLX";
char *display_name = getenv("DISPLAY");
mDisplay = XOpenDisplay(display_name);
mScreen = XDefaultScreen(mDisplay);