From b162e83c498b578523cef3360fa7651cfc23b4a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B8rgen=20Lind?= <jorgen.lind@theqtcompany.com>
Date: Mon, 31 Aug 2015 12:19:02 +0200
Subject: compilefix for removed qwlcompositor_p.h header in HW integrations

and other api adjustments

Change-Id: Idda1bfa314d401f59029f2adafbb245a47c267ac
---
 src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h      |  1 -
 .../compositor/brcm-egl/brcmeglintegration.cpp                |  1 -
 .../compositor/xcomposite-glx/xcompositeglxintegration.cpp    | 11 +++++------
 .../compositor/xcomposite-glx/xcompositeglxintegration.h      |  4 ++--
 4 files changed, 7 insertions(+), 10 deletions(-)

(limited to 'src/hardwareintegration')

diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
index 076869ba9..a825a1fd2 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmbuffer.h
@@ -37,7 +37,6 @@
 #ifndef BRCMBUFFER_H
 #define BRCMBUFFER_H
 
-#include <QtCompositor/private/qwlcompositor_p.h>
 #include <QtCompositor/private/qwayland-server-wayland.h>
 
 #include <QtCore/QSize>
diff --git a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
index 7d9ff0b38..ed4cc4419 100644
--- a/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
+++ b/src/hardwareintegration/compositor/brcm-egl/brcmeglintegration.cpp
@@ -37,7 +37,6 @@
 #include "brcmeglintegration.h"
 #include "brcmbuffer.h"
 #include <QtCompositor/private/qwlsurface_p.h>
-#include <QtCompositor/private/qwlcompositor_p.h>
 #include <QtCompositor/qwaylandsurface.h>
 #include <qpa/qplatformnativeinterface.h>
 #include <QtGui/QGuiApplication>
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
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
index 812537024..70b774ef0 100644
--- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
+++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h
@@ -55,10 +55,10 @@ public:
     XCompositeGLXClientBufferIntegration();
     ~XCompositeGLXClientBufferIntegration();
 
-    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;
+    QWaylandSurface::Origin origin(struct ::wl_resource *) const Q_DECL_OVERRIDE;
 
     QSize bufferSize(struct ::wl_resource *buffer) const Q_DECL_OVERRIDE;
 
-- 
cgit v1.2.3