Merge remote-tracking branch 'origin/5.4' into dev

Conflicts:
	src/quick/items/qquickpainteditem.h
	src/quick/items/qquickshadereffectsource.cpp
	src/quick/items/qquickshadereffectsource_p.h

Change-Id: If98096443afe85fc4370cef971eace050006a61b

1 files changed, 131 insertions, 0 deletions

diff --git a/src/quick/scenegraph/qsgdefaultlayer_p.h b/src/quick/scenegraph/qsgdefaultlayer_p.h
new file mode 100644
index 0000000000..b4a5adab5a
--- /dev/null
+++ b/src/quick/scenegraph/qsgdefaultlayer_p.h
@@ -0,0 +1,131 @@
+/****************************************************************************
+**
+** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies).
+** Contact: http://www.qt-project.org/legal
+**
+** This file is part of the QtQuick module 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 Digia.  For licensing terms and
+** conditions see http://qt.digia.com/licensing.  For further information
+** use the contact form at http://qt.digia.com/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 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file.  Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Digia gives you certain additional
+** rights.  These rights are described in the Digia Qt 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 3.0 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 3.0 requirements will be
+** met: http://www.gnu.org/copyleft/gpl.html.
+**
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+#ifndef QSGDEFAULTLAYER_P_H
+#define QSGDEFAULTLAYER_P_H
+
+#include <private/qsgadaptationlayer_p.h>
+#include <private/qsgcontext_p.h>
+#include <qsgsimplerectnode.h>
+
+#define QSG_DEBUG_FBO_OVERLAY
+
+class Q_QUICK_PRIVATE_EXPORT QSGDefaultLayer : public QSGLayer
+{
+    Q_OBJECT
+public:
+    QSGDefaultLayer(QSGRenderContext *context);
+    ~QSGDefaultLayer();
+
+    bool updateTexture() Q_DECL_OVERRIDE;
+
+    // The item's "paint node", not effect node.
+    QSGNode *item() const { return m_item; }
+    void setItem(QSGNode *item);
+
+    void setShaderSourceNode(QSGNode *node) { m_shaderSourceNode = node; }
+
+    QRectF rect() const { return m_rect; }
+    void setRect(const QRectF &rect);
+
+    QSize size() const { return m_size; }
+    void setSize(const QSize &size);
+
+    void setHasMipmaps(bool mipmap);
+
+    void bind();
+
+    bool hasAlphaChannel() const;
+    bool hasMipmaps() const;
+    int textureId() const;
+    QSize textureSize() const { return m_size; }
+
+    GLenum format() const { return m_format; }
+    void setFormat(GLenum format);
+
+    bool live() const { return bool(m_live); }
+    void setLive(bool live);
+
+    bool recursive() const { return bool(m_recursive); }
+    void setRecursive(bool recursive);
+
+    void setDevicePixelRatio(qreal ratio) { m_device_pixel_ratio = ratio; }
+
+    void scheduleUpdate();
+
+    QImage toImage() const;
+
+public Q_SLOTS:
+    void markDirtyTexture();
+    void invalidated();
+
+private:
+    void grab();
+
+    QSGNode *m_item;
+    QSGNode *m_shaderSourceNode;
+    QRectF m_rect;
+    QSize m_size;
+    qreal m_device_pixel_ratio;
+    GLenum m_format;
+
+    QSGRenderer *m_renderer;
+    QOpenGLFramebufferObject *m_fbo;
+    QOpenGLFramebufferObject *m_secondaryFbo;
+    QSharedPointer<QSGDepthStencilBuffer> m_depthStencilBuffer;
+
+    GLuint m_transparentTexture;
+
+#ifdef QSG_DEBUG_FBO_OVERLAY
+    QSGSimpleRectNode *m_debugOverlay;
+#endif
+
+    QSGRenderContext *m_context;
+
+    uint m_mipmap : 1;
+    uint m_live : 1;
+    uint m_recursive : 1;
+    uint m_dirtyTexture : 1;
+    uint m_multisamplingChecked : 1;
+    uint m_multisampling : 1;
+    uint m_grab : 1;
+};
+
+#endif // QSGDEFAULTLAYER_P_H