diff options
| author | Donald Carr <sirspudd@gmail.com> | 2016-03-15 13:25:36 -0700 |
|---|---|---|
| committer | Donald Carr <donald.carr@theqtcompany.com> | 2016-03-23 21:31:19 +0000 |
| commit | bfa0951619e56e856cc1443f78fbdb66e3bde009 (patch) | |
| tree | fb401187028dc6fac8e23ed8b21c60316446dc3e | |
| parent | 36cdbd31c6df9d43a7e37a10cc2db49539164d8a (diff) | |
Adjust Raspberry Pi integration to new API
Change-Id: I7ef64e5dd5e87e62ec83fc05076a5c2e93d11638
Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Reviewed-by: Robin Burchell <robin.burchell@viroteck.net>
3 files changed, 4 insertions, 11 deletions
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri index 83c7b6212..f4780710a 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri +++ b/src/hardwareintegration/compositor/brcm-egl/brcm-egl.pri @@ -1,4 +1,4 @@ -QT = compositor compositor-private core-private gui-private +QT = waylandcompositor waylandcompositor-private core-private gui-private INCLUDEPATH += $$PWD diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp index 08df6359e..508e88257 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp +++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp @@ -36,7 +36,6 @@ #include "brcmeglintegration.h" #include "brcmbuffer.h" -#include <QtWaylandCompositor/private/qwlsurface_p.h> #include <QtWaylandCompositor/qwaylandsurface.h> #include <qpa/qplatformnativeinterface.h> #include <QtGui/QGuiApplication> @@ -76,7 +75,7 @@ BrcmEglIntegration::BrcmEglIntegration() { } -void BrcmEglIntegration::initializeHardware(QtWayland::Display *waylandDisplay) +void BrcmEglIntegration::initializeHardware(struct ::wl_display *display) { Q_D(BrcmEglIntegration); @@ -114,7 +113,7 @@ void BrcmEglIntegration::initializeHardware(QtWayland::Display *waylandDisplay) return; } d->valid = true; - init(waylandDisplay->handle(), 1); + init(display, 1); } } @@ -147,11 +146,6 @@ void BrcmEglIntegration::bindTextureToBuffer(struct ::wl_resource *buffer) d->eglDestroyImageKHR(d->egl_display, image); } -bool BrcmEglIntegration::isYInverted(struct ::wl_resource *) const -{ - return false; -} - void BrcmEglIntegration::brcm_bind_resource(Resource *) { } diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h index 90f447c50..48dd9c42e 100644 --- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h +++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.h @@ -52,10 +52,9 @@ class BrcmEglIntegration : public QtWayland::ClientBufferIntegration, public QtW public: BrcmEglIntegration(); - void initializeHardware(QtWayland::Display *waylandDisplay) Q_DECL_OVERRIDE; + void initializeHardware(struct ::wl_display *display) Q_DECL_OVERRIDE; void bindTextureToBuffer(struct ::wl_resource *buffer) Q_DECL_OVERRIDE; - bool isYInverted(struct ::wl_resource *) const Q_DECL_OVERRIDE; QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE; |