1 files changed, 52 insertions, 50 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
index 47f5e5de09..8b4a4c0b2f 100644
--- a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
+++ b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h
@@ -1,41 +1,5 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 Klaralvdalens Datakonsult AB (KDAB).
-** 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_P_H
 #define QSGMATERIALSHADER_P_H
@@ -52,26 +16,64 @@
 //
 
 #include <private/qtquickglobal_p.h>
-#include <QOpenGLShader>
+#include "qsgmaterialshader.h"
+#include "qsgmaterial.h"
+#include <rhi/qrhi.h>
+#include <rhi/qshader.h>
 
 QT_BEGIN_NAMESPACE
 
-class Q_QUICK_PRIVATE_EXPORT QSGMaterialShaderPrivate
+class QRhiSampler;
+
+class Q_QUICK_EXPORT QSGMaterialShaderPrivate
 {
 public:
-#if QT_CONFIG(opengl)
-    const char *loadShaderSource(QOpenGLShader::ShaderType type) const;
+    Q_DECLARE_PUBLIC(QSGMaterialShader)
 
-    QHash<QOpenGLShader::ShaderType, QStringList> m_sourceFiles;
-    mutable QHash<QOpenGLShader::ShaderType, QByteArray> m_sources;
-#endif
+    QSGMaterialShaderPrivate(QSGMaterialShader *q) : q_ptr(q) { }
+    static QSGMaterialShaderPrivate *get(QSGMaterialShader *s) { return s->d_func(); }
+    static const QSGMaterialShaderPrivate *get(const QSGMaterialShader *s) { return s->d_func(); }
+
+    void clearCachedRendererData();
+    void prepare(QShader::Variant vertexShaderVariant);
+
+    QShader shader(QShader::Stage stage) const { return shaders[stage].shader; }
+
+    static QShader loadShader(const QString &filename);
+
+    QSGMaterialShader *q_ptr;
+    QHash<QShader::Stage, QString> shaderFileNames;
+    QSGMaterialShader::Flags flags;
+
+    struct ShaderStageData {
+        ShaderStageData() { } // so shader.isValid() == false
+        ShaderStageData(const QShader &shader) : shader(shader) { }
+        QShader shader;
+        QShader::Variant shaderVariant = QShader::StandardShader;
+        QVector<int> vertexInputLocations; // excluding rewriter-inserted ones
+        int qt_order_attrib_location = -1; // rewriter-inserted
+    };
+    QHash<QShader::Stage, ShaderStageData> shaders;
+
+    static const int MAX_SHADER_RESOURCE_BINDINGS = 32;
+
+    int ubufBinding = -1;
+    int ubufSize = 0;
+    QRhiShaderResourceBinding::StageFlags ubufStages;
+    QRhiShaderResourceBinding::StageFlags combinedImageSamplerBindings[MAX_SHADER_RESOURCE_BINDINGS];
+    int combinedImageSamplerCount[MAX_SHADER_RESOURCE_BINDINGS];
+
+    ShaderStageData *vertexShader = nullptr;
+    ShaderStageData *fragmentShader = nullptr;
+
+    QByteArray masterUniformData;
+
+    QVarLengthArray<QSGTexture *, 4> textureBindingTable[MAX_SHADER_RESOURCE_BINDINGS];
+    QVarLengthArray<QRhiSampler *, 4> samplerBindingTable[MAX_SHADER_RESOURCE_BINDINGS];
 };
 
-#ifndef QT_NO_DEBUG
-Q_QUICK_PRIVATE_EXPORT bool qsg_test_and_clear_material_failure();
-Q_QUICK_PRIVATE_EXPORT void qsg_set_material_failure();
-#endif
+Q_DECLARE_TYPEINFO(QSGMaterialShaderPrivate::ShaderStageData, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
-#endif // QSGMATERIALSHADER_P_H
+#endif