Move the texture ownership from the QWaylandSurface

to the respective QWaylandSurfaceView. For all GL applications this will have no
significant impact, but will cause a memory regression for shm surfaces
with multiple views.

This is done to simplify the creation and destruction of textures,
especially in multi-threaded environments.

Also the same patch removes the y_inverted property and replaces it with
a origin property. Its done in the same patch as a lot of the code was
overlapping.

Change-Id: I4bce50c614c9ac3ba0580e0560339476eac03433

1 files changed, 6 insertions, 27 deletions

diff --git a/src/compositor/compositor_api/qwaylandsurface.cpp b/src/compositor/compositor_api/qwaylandsurface.cpp
index bec39a184..5ffe58e0a 100644
--- a/src/compositor/compositor_api/qwaylandsurface.cpp
+++ b/src/compositor/compositor_api/qwaylandsurface.cpp
@@ -132,20 +132,17 @@ QWaylandOutput *QWaylandSurfaceLeaveEvent::output() const
 QWaylandSurface::QWaylandSurface(wl_client *client, quint32 id, int version, QWaylandCompositor *compositor)
     : QObject(*new QWaylandSurfacePrivate(client, id, version, compositor, this))
 {
-
 }
 
 QWaylandSurface::QWaylandSurface(QWaylandSurfacePrivate *dptr)
                : QObject(*dptr)
 {
-
 }
 
 QWaylandSurface::~QWaylandSurface()
 {
     Q_D(QWaylandSurface);
     qDeleteAll(d->interfaces);
-    delete d->m_attacher;
 }
 
 QWaylandClient *QWaylandSurface::client() const
@@ -186,18 +183,6 @@ void QWaylandSurface::removeInterface(QWaylandSurfaceInterface *iface)
     d->interfaces.removeOne(iface);
 }
 
-QWaylandSurface::Type QWaylandSurface::type() const
-{
-    Q_D(const QWaylandSurface);
-    return d->type();
-}
-
-bool QWaylandSurface::isYInverted() const
-{
-    Q_D(const QWaylandSurface);
-    return d->isYInverted();
-}
-
 bool QWaylandSurface::visible() const
 {
     return isMapped();
@@ -253,6 +238,12 @@ QWaylandSurface::WindowType QWaylandSurface::windowType() const
     return d->windowType;
 }
 
+QWaylandSurface::Origin QWaylandSurface::origin() const
+{
+    Q_D(const QWaylandSurface);
+    return d->origin();
+}
+
 QWaylandSurface *QWaylandSurface::transientParent() const
 {
     Q_D(const QWaylandSurface);
@@ -459,18 +450,6 @@ void QWaylandSurface::setMapped(bool mapped)
     d->setMapped(mapped);
 }
 
-void QWaylandSurface::setBufferAttacher(QWaylandBufferAttacher *attacher)
-{
-    Q_D(QWaylandSurface);
-    d->m_attacher = attacher;
-}
-
-QWaylandBufferAttacher *QWaylandSurface::bufferAttacher() const
-{
-    Q_D(const QWaylandSurface);
-    return d->m_attacher;
-}
-
 QList<QWaylandSurfaceView *> QWaylandSurface::views() const
 {
     Q_D(const QWaylandSurface);