1 files changed, 21 insertions, 41 deletions

diff --git a/src/opengl/qopenglcompositor_p.h b/src/opengl/qopenglcompositor_p.h
index d0d1c9303d..86229b13ca 100644
--- a/src/opengl/qopenglcompositor_p.h
+++ b/src/opengl/qopenglcompositor_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** This file is part of the plugins of the Qt Toolkit.
-**
-** $QT_BEGIN_LICENSE:LGPL$
-** Commercial License Usage
-** Licensees holding valid commercial Qt licenses may use this file in
-** accordance with the commercial license agreement provided with the
-** Software or, alternatively, in accordance with the terms contained in
-** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see https://www.qt.io/terms-conditions. For further
-** information use the contact form at https://www.qt.io/contact-us.
-**
-** GNU Lesser General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU Lesser
-** General Public License version 3 as published by the Free Software
-** Foundation and appearing in the file LICENSE.LGPL3 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-3.0.html.
-**
-** GNU General Public License Usage
-** Alternatively, this file may be used under the terms of the GNU
-** General Public License version 2.0 or (at your option) the GNU General
-** Public license version 3 or any later version approved by the KDE Free
-** Qt Foundation. The licenses are as published by the Free Software
-** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
-** included in the packaging of this file. Please review the following
-** information to ensure the GNU General Public License requirements will
-** be met: https://www.gnu.org/licenses/gpl-2.0.html and
-** https://www.gnu.org/licenses/gpl-3.0.html.
-**
-** $QT_END_LICENSE$
-**
-****************************************************************************/
+// Copyright (C) 2020 The Qt Company Ltd.
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
 
 #ifndef QOPENGLCOMPOSITOR_H
 #define QOPENGLCOMPOSITOR_H
@@ -56,6 +20,7 @@
 #include <QtCore/QTimer>
 #include <QtOpenGL/QOpenGLTextureBlitter>
 #include <QtGui/QMatrix4x4>
+#include <QtCore/private/qglobal_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,6 +29,7 @@ class QOpenGLFramebufferObject;
 class QWindow;
 class QPlatformTextureList;
 
+class QOpenGLCompositorBackingStore;
 class QOpenGLCompositorWindow
 {
 public:
@@ -72,6 +38,8 @@ public:
     virtual const QPlatformTextureList *textures() const = 0;
     virtual void beginCompositing() { }
     virtual void endCompositing() { }
+    virtual void setBackingStore(QOpenGLCompositorBackingStore *backingStore) = 0;
+    virtual QOpenGLCompositorBackingStore *backingStore() const = 0;
 };
 
 class Q_OPENGL_EXPORT QOpenGLCompositor : public QObject
@@ -79,17 +47,26 @@ class Q_OPENGL_EXPORT QOpenGLCompositor : public QObject
     Q_OBJECT
 
 public:
+    enum GrabOrientation {
+        Flipped,
+        NotFlipped,
+    };
+
     static QOpenGLCompositor *instance();
     static void destroy();
 
-    void setTarget(QOpenGLContext *context, QWindow *window, const QRect &nativeTargetGeometry);
+    void setTargetWindow(QWindow *window, const QRect &nativeTargetGeometry);
+    void setTargetContext(QOpenGLContext *context);
     void setRotation(int degrees);
     QOpenGLContext *context() const { return m_context; }
     QWindow *targetWindow() const { return m_targetWindow; }
+    QRect nativeTargetGeometry() const { return m_nativeTargetGeometry; }
 
     void update();
     QImage grab();
 
+    bool grabToFrameBufferObject(QOpenGLFramebufferObject *fbo, GrabOrientation orientation = Flipped);
+
     QList<QOpenGLCompositorWindow *> windows() const { return m_windows; }
     void addWindow(QOpenGLCompositorWindow *window);
     void removeWindow(QOpenGLCompositorWindow *window);
@@ -106,8 +83,11 @@ private:
     QOpenGLCompositor();
     ~QOpenGLCompositor();
 
-    void renderAll(QOpenGLFramebufferObject *fbo);
-    void render(QOpenGLCompositorWindow *window);
+    void renderAll(QOpenGLFramebufferObject *fbo,
+                   QOpenGLTextureBlitter::Origin origin = QOpenGLTextureBlitter::OriginTopLeft);
+    void render(QOpenGLCompositorWindow *window,
+                QOpenGLTextureBlitter::Origin origin = QOpenGLTextureBlitter::OriginTopLeft);
+    void ensureCorrectZOrder();
 
     QOpenGLContext *m_context;
     QWindow *m_targetWindow;