diff options
| author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-08-31 12:19:02 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-08-31 13:21:21 +0200 |
| commit | b162e83c498b578523cef3360fa7651cfc23b4a9 (patch) | |
| tree | 6f215042cef2dc6922aa805aa04314dacc3c3cea /src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp | |
| parent | 920d96c4732ea2135553c843e811250d64fc977f (diff) | |
compilefix for removed qwlcompositor_p.h header in HW integrations
and other api adjustments
Change-Id: Idda1bfa314d401f59029f2adafbb245a47c267ac
Diffstat (limited to 'src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp')
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp index 5f878fbf5..6f70d2bbf 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.cpp @@ -36,7 +36,6 @@ #include "xcompositeglxintegration.h" -#include <QtCompositor/private/qwlcompositor_p.h> #include "wayland-xcomposite-server-protocol.h" #include <qpa/qplatformnativeinterface.h> @@ -80,7 +79,7 @@ XCompositeGLXClientBufferIntegration::~XCompositeGLXClientBufferIntegration() delete mHandler; } -void XCompositeGLXClientBufferIntegration::initializeHardware(QtWayland::Display *) +void XCompositeGLXClientBufferIntegration::initializeHardware(struct ::wl_display *) { qDebug() << "Initializing GLX integration"; QPlatformNativeInterface *nativeInterface = QGuiApplicationPrivate::platformIntegration()->nativeInterface(); @@ -93,7 +92,7 @@ void XCompositeGLXClientBufferIntegration::initializeHardware(QtWayland::Display } mScreen = XDefaultScreen(mDisplay); - mHandler = new XCompositeHandler(m_compositor->handle(), mDisplay); + mHandler = new XCompositeHandler(m_compositor, mDisplay); QOpenGLContext *glContext = new QOpenGLContext(); glContext->create(); @@ -129,7 +128,7 @@ void XCompositeGLXClientBufferIntegration::bindTextureToBuffer(struct ::wl_resou uint inverted = 0; glXQueryDrawable(mDisplay, glxPixmap, GLX_Y_INVERTED_EXT,&inverted); - compositorBuffer->setInvertedY(!inverted); + compositorBuffer->setOrigin(inverted ? QWaylandSurface::OriginBottomLeft : QWaylandSurface::OriginTopLeft); XFree(configs); @@ -139,9 +138,9 @@ void XCompositeGLXClientBufferIntegration::bindTextureToBuffer(struct ::wl_resou // m_glxReleaseTexImageEXT(mDisplay,glxPixmap,GLX_FRONT_EXT); } -bool XCompositeGLXClientBufferIntegration::isYInverted(struct ::wl_resource *buffer) const +QWaylandSurface::Origin XCompositeGLXClientBufferIntegration::origin(struct ::wl_resource *buffer) const { - return XCompositeBuffer::fromResource(buffer)->isYInverted(); + return XCompositeBuffer::fromResource(buffer)->origin(); } QSize XCompositeGLXClientBufferIntegration::bufferSize(struct ::wl_resource *buffer) const |