1 files changed, 20 insertions, 41 deletions

diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader.h b/src/quick/scenegraph/coreapi/qsgmaterialshader.h
index bde210bef8..795da77477 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterialshader.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterialshader.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2019 The Qt Company Ltd.
-** Contact: https://www.qt.io/licensing/
-**
-** 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 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) 2019 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 QSGMATERIALSHADER_H
 #define QSGMATERIALSHADER_H
@@ -71,13 +35,16 @@ public:
 
         inline DirtyStates dirtyStates() const { return m_dirty; }
 
-        inline bool isMatrixDirty() const { return m_dirty & QSGMaterialShader::RenderState::DirtyMatrix; }
-        inline bool isOpacityDirty() const { return m_dirty & QSGMaterialShader::RenderState::DirtyOpacity; }
+        inline bool isMatrixDirty() const { return bool(m_dirty & QSGMaterialShader::RenderState::DirtyMatrix); }
+        inline bool isOpacityDirty() const { return bool(m_dirty & QSGMaterialShader::RenderState::DirtyOpacity); }
 
         float opacity() const;
         QMatrix4x4 combinedMatrix() const;
+        QMatrix4x4 combinedMatrix(int index) const;
         QMatrix4x4 modelViewMatrix() const;
         QMatrix4x4 projectionMatrix() const;
+        QMatrix4x4 projectionMatrix(int index) const;
+        int projectionMatrixCount() const;
         QRect viewportRect() const;
         QRect deviceRect() const;
         float determinant() const;
@@ -93,7 +60,7 @@ public:
         const void *m_data;
     };
 
-    struct Q_QUICK_EXPORT GraphicsPipelineState {
+    struct GraphicsPipelineState {
         enum BlendFactor {
             Zero,
             One,
@@ -130,12 +97,21 @@ public:
             CullBack
         };
 
+        enum PolygonMode {
+            Fill,
+            Line,
+        };
+
         bool blendEnable;
         BlendFactor srcColor;
         BlendFactor dstColor;
         ColorMask colorWrite;
         QColor blendConstant;
         CullMode cullMode;
+        PolygonMode polygonMode;
+        bool separateBlendFactors;
+        BlendFactor srcAlpha;
+        BlendFactor dstAlpha;
         // This struct is extensible while keeping BC since apps only ever get
         // a ptr to the struct, it is not created by them.
     };
@@ -166,12 +142,15 @@ public:
     void setFlag(Flags flags, bool on = true);
     void setFlags(Flags flags);
 
+    int combinedImageSamplerCount(int binding) const;
+
 protected:
     Q_DECLARE_PRIVATE(QSGMaterialShader)
     QSGMaterialShader(QSGMaterialShaderPrivate &dd);
 
     // filename is for a file containing a serialized QShader.
     void setShaderFileName(Stage stage, const QString &filename);
+    void setShaderFileName(Stage stage, const QString &filename, int viewCount);
 
     void setShader(Stage stage, const QShader &shader);