Merge branch 'wip-compositor-api' into dev

This introduces the new compositor API, removing the
old API (which was never officially supported).

Change-Id: I1dc01f0fb4edc749e34ed8356e56ad87d7d64913

1 files changed, 32 insertions, 27 deletions

diff --git a/src/compositor/compositor_api/qwaylandbufferref.h b/src/compositor/compositor_api/qwaylandbufferref.h
index 618a36622..5683a0b31 100644
--- a/src/compositor/compositor_api/qwaylandbufferref.h
+++ b/src/compositor/compositor_api/qwaylandbufferref.h
@@ -3,9 +3,9 @@
 ** Copyright (C) 2014 Jolla Ltd, author: <giulio.camuffo@jollamobile.com>
 ** Contact: http://www.qt.io/licensing/
 **
-** This file is part of the plugins of the Qt Toolkit.
+** This file is part of the QtWaylandCompositor module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL3$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
@@ -16,16 +16,19 @@
 **
 ** GNU Lesser General Public License Usage
 ** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 2.1 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPLv3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+** GNU General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU
+** General Public License version 2.0 or later as published by the Free
+** Software Foundation and appearing in the file LICENSE.GPL included in
+** the packaging of this file. Please review the following information to
+** ensure the GNU General Public License version 2.0 requirements will be
+** met: http://www.gnu.org/licenses/gpl-2.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -40,7 +43,10 @@
 #include <QtGui/qopengl.h>
 #endif
 
-#include <QtCompositor/qwaylandexport.h>
+#include <QtWaylandCompositor/QWaylandSurface>
+#include <QtWaylandCompositor/qwaylandexport.h>
+
+struct wl_resource;
 
 QT_BEGIN_NAMESPACE
 
@@ -58,24 +64,23 @@ public:
     ~QWaylandBufferRef();
 
     QWaylandBufferRef &operator=(const QWaylandBufferRef &ref);
-    operator bool() const;
-    bool isShm() const;
+    bool isNull() const;
+    bool hasBuffer() const;
+    bool isDestroyed() const;
+    bool operator==(const QWaylandBufferRef &ref);
+    bool operator!=(const QWaylandBufferRef &ref);
+
+    struct wl_resource *wl_buffer() const;
+
+    QSize size() const;
+    QWaylandSurface::Origin origin() const;
 
+    bool isShm() const;
     QImage image() const;
-    void *waylandBuffer() const;
 
-#ifdef QT_COMPOSITOR_WAYLAND_GL
-    /**
-     * There must be a GL context bound when calling this function.
-     * The texture will be automatically destroyed when the last QWaylandBufferRef
-     * referring to the same underlying buffer will be destroyed or reset.
-     */
-    GLuint createTexture();
-    GLenum textureTarget() const;
-    void updateTexture();
-    void destroyTexture();
-    void *nativeBuffer() const;
-#endif
+    void bindToTexture() const;
+    int textureTarget() const;
+    void updateTexture() const;
 
 private:
     class QWaylandBufferRefPrivate *const d;