diff options
| author | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-23 06:01:56 (GMT) |
|---|---|---|
| committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-03-23 16:00:21 (GMT) |
| commit | 9ca3f9c6b6ae50c6b8a19d5e4b26bff15d5421e6 (patch) | |
| tree | d9c717421fdca413472f94634a3972321bc91f05 /src/plugins/platforms/wayland/qwaylanddisplay.h | |
| parent | 2905f11e8e8fe7e05d61cec9fcc1d78ff91f0f31 (diff) | |
| download | Qt-9ca3f9c6b6ae50c6b8a19d5e4b26bff15d5421e6.zip Qt-9ca3f9c6b6ae50c6b8a19d5e4b26bff15d5421e6.tar.gz Qt-9ca3f9c6b6ae50c6b8a19d5e4b26bff15d5421e6.tar.bz2 | |
Lighthouse: Wayland, implement gl_integration
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylanddisplay.h')
| -rw-r--r-- | src/plugins/platforms/wayland/qwaylanddisplay.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/plugins/platforms/wayland/qwaylanddisplay.h b/src/plugins/platforms/wayland/qwaylanddisplay.h index d994ffe..535dcd6 100644 --- a/src/plugins/platforms/wayland/qwaylanddisplay.h +++ b/src/plugins/platforms/wayland/qwaylanddisplay.h @@ -44,18 +44,15 @@ #include <QtCore/QObject> #include <QtCore/QRect> -#include <QtCore/QDataStream> -#include <QtCore/QTextStream> -#include <QtCore/QMetaType> -#include <QtGui> -#include "qwaylandinclude.h" +#include <wayland-client.h> class QWaylandInputDevice; class QSocketNotifier; class QWaylandBuffer; class QPlatformScreen; class QWaylandScreen; +class QWaylandGLIntegration; class QWaylandDisplay : public QObject { Q_OBJECT @@ -73,9 +70,10 @@ public: struct wl_visual *rgbVisual(); struct wl_visual *argbVisual(); struct wl_visual *argbPremultipliedVisual(); - struct wl_egl_display *nativeDisplay(); - EGLDisplay eglDisplay() { return mEglDisplay; } +#ifdef QT_WAYLAND_GL_SUPPORT + QWaylandGLIntegration *eglIntegration(); +#endif void setCursor(QWaylandBuffer *buffer, int32_t x, int32_t y); void syncCallback(wl_display_sync_func_t func, void *data); @@ -98,8 +96,9 @@ private: QList<QWaylandInputDevice *> mInputDevices; QSocketNotifier *mReadNotifier; QSocketNotifier *mWriteNotifier; - EGLDisplay mEglDisplay; - struct wl_egl_display *mNativeEglDisplay; +#ifdef QT_WAYLAND_GL_SUPPORT + QWaylandGLIntegration *mEglIntegration; +#endif static void displayHandleGlobal(struct wl_display *display, uint32_t id, |