diff options
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgmaterialshader_p.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterialshader_p.h | 51 |
1 files changed, 8 insertions, 43 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h index 42d1635c84..8b4a4c0b2f 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterialshader_p.h +++ b/src/quick/scenegraph/coreapi/qsgmaterialshader_p.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_P_H #define QSGMATERIALSHADER_P_H @@ -54,14 +18,14 @@ #include <private/qtquickglobal_p.h> #include "qsgmaterialshader.h" #include "qsgmaterial.h" -#include <QtGui/private/qrhi_p.h> -#include <QtGui/private/qshader_p.h> +#include <rhi/qrhi.h> +#include <rhi/qshader.h> QT_BEGIN_NAMESPACE class QRhiSampler; -class Q_QUICK_PRIVATE_EXPORT QSGMaterialShaderPrivate +class Q_QUICK_EXPORT QSGMaterialShaderPrivate { public: Q_DECLARE_PUBLIC(QSGMaterialShader) @@ -97,14 +61,15 @@ public: 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; - QSGTexture *textureBindingTable[MAX_SHADER_RESOURCE_BINDINGS]; - QRhiSampler *samplerBindingTable[MAX_SHADER_RESOURCE_BINDINGS]; + QVarLengthArray<QSGTexture *, 4> textureBindingTable[MAX_SHADER_RESOURCE_BINDINGS]; + QVarLengthArray<QRhiSampler *, 4> samplerBindingTable[MAX_SHADER_RESOURCE_BINDINGS]; }; Q_DECLARE_TYPEINFO(QSGMaterialShaderPrivate::ShaderStageData, Q_RELOCATABLE_TYPE); |