diff options
Diffstat (limited to 'src/quick/scenegraph/qsgrhishadereffectnode_p.h')
-rw-r--r-- | src/quick/scenegraph/qsgrhishadereffectnode_p.h | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/src/quick/scenegraph/qsgrhishadereffectnode_p.h b/src/quick/scenegraph/qsgrhishadereffectnode_p.h index 0bef0d571d..376c7d38ab 100644 --- a/src/quick/scenegraph/qsgrhishadereffectnode_p.h +++ b/src/quick/scenegraph/qsgrhishadereffectnode_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 QSGRHISHADEREFFECTNODE_P_H #define QSGRHISHADEREFFECTNODE_P_H @@ -86,7 +50,6 @@ public: bool m_error; QShader m_vs; QShader m_fs; - uint m_constantBufferSize; QHash<uint, Constant> m_constants; // offset -> Constant QHash<int, QVariant> m_samplers; // binding -> value (source ref) QHash<QByteArray, int> m_samplerNameMap; // name -> binding @@ -113,6 +76,7 @@ public: QSGRhiShaderEffectNode *m_node; QSGMaterialType *m_materialType = nullptr; + void *m_materialTypeCacheKey = nullptr; QSGRhiShaderLinker m_linker; QVector<QSGTextureProvider *> m_textureProviders; // [binding] = QSGTextureProvider bool m_geometryUsesTextureSubRect = false; @@ -135,14 +99,14 @@ public: void syncMaterial(SyncData *syncData) override; void preprocess() override; - static void cleanupMaterialTypeCache(); + static void resetMaterialTypeCache(void *materialTypeCacheKey); + static void garbageCollectMaterialTypeCache(void *materialTypeCacheKey); private Q_SLOTS: void handleTextureChange(); void handleTextureProviderDestroyed(QObject *object); private: - QSGDefaultRenderContext *m_rc; QSGRhiShaderEffectMaterial m_material; }; |