diff options
| author | Laszlo Agocs <laszlo.agocs@digia.com> | 2014-05-12 14:41:06 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-12 15:03:30 +0200 |
| commit | 189ad97ce3bf78d78453b2a614b3d813bc383e57 (patch) | |
| tree | b53643ee881d631009eb369aae5f9fe1b21d4115 /src/hardwareintegration | |
| parent | 5b740c6246e092bc49b029bb7b12b614c4d0ce1e (diff) | |
Fix build after QEGLPlatformContext API change
Change-Id: I7f2a72ad1430d48f54565b3996b61260756f3edf
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/hardwareintegration')
3 files changed, 7 insertions, 4 deletions
diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp index c26ebd6ae..77c4d4a02 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglclientbufferintegration.cpp @@ -44,6 +44,7 @@ #include "qwaylandxcompositeeglwindow.h" #include <QtCore/QDebug> +#include <QtPlatformSupport/private/qeglconvenience_p.h> #include "wayland-xcomposite-client-protocol.h" @@ -79,7 +80,9 @@ QWaylandWindow * QWaylandXCompositeEGLClientBufferIntegration::createEglWindow(Q QPlatformOpenGLContext *QWaylandXCompositeEGLClientBufferIntegration::createPlatformOpenGLContext(const QSurfaceFormat &glFormat, QPlatformOpenGLContext *share) const { - return new QWaylandXCompositeEGLContext(glFormat, share, eglDisplay()); + EGLDisplay display = eglDisplay(); + EGLConfig config = q_configFromGLFormat(display, glFormat, true, EGL_WINDOW_BIT | EGL_PIXMAP_BIT); + return new QWaylandXCompositeEGLContext(glFormat, share, display, config); } Display * QWaylandXCompositeEGLClientBufferIntegration::xDisplay() const diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp index b9a2bb445..1c0e58a34 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.cpp @@ -50,8 +50,8 @@ QT_BEGIN_NAMESPACE -QWaylandXCompositeEGLContext::QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display) - : QEGLPlatformContext(format, share, display, q_configFromGLFormat(display, format, true, EGL_WINDOW_BIT | EGL_PIXMAP_BIT)) +QWaylandXCompositeEGLContext::QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, EGLConfig config) + : QEGLPlatformContext(format, share, display, &config) { } diff --git a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h index bc988480d..7a503a7d8 100644 --- a/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h +++ b/src/hardwareintegration/client/xcomposite-egl/qwaylandxcompositeeglcontext.h @@ -55,7 +55,7 @@ class QWaylandXCompositeEGLWindow; class QWaylandXCompositeEGLContext : public QEGLPlatformContext { public: - QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display); + QWaylandXCompositeEGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, EGLDisplay display, EGLConfig config); void swapBuffers(QPlatformSurface *surface); |