diff options
Diffstat (limited to 'src/quick/scenegraph/coreapi/qsgmaterial.h')
| -rw-r--r-- | src/quick/scenegraph/coreapi/qsgmaterial.h | 58 |
1 files changed, 15 insertions, 43 deletions
diff --git a/src/quick/scenegraph/coreapi/qsgmaterial.h b/src/quick/scenegraph/coreapi/qsgmaterial.h index cb6e9a456a..ca3f134a9d 100644 --- a/src/quick/scenegraph/coreapi/qsgmaterial.h +++ b/src/quick/scenegraph/coreapi/qsgmaterial.h @@ -1,49 +1,13 @@ -/**************************************************************************** -** -** 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 QSGMATERIAL_H #define QSGMATERIAL_H #include <QtQuick/qtquickglobal.h> #include <QtQuick/qsgmaterialshader.h> -#include <QtQuick/qsgmaterialrhishader.h> #include <QtQuick/qsgmaterialtype.h> +#include <QtQuick/qsgrendererinterface.h> QT_BEGIN_NAMESPACE @@ -55,12 +19,18 @@ public: RequiresDeterminant = 0x0002, // Allow precalculated translation and 2D rotation RequiresFullMatrixExceptTranslate = 0x0004 | RequiresDeterminant, // Allow precalculated translation RequiresFullMatrix = 0x0008 | RequiresFullMatrixExceptTranslate, + NoBatching = 0x0010, - CustomCompileStep = 0x0010, + MultiView2 = 0x10000, + MultiView3 = 0x20000, + MultiView4 = 0x40000, - SupportsRhiShader = 0x0020, +#if QT_DEPRECATED_SINCE(6, 3) + CustomCompileStep Q_DECL_ENUMERATOR_DEPRECATED_X( + "Qt 6 does not have custom shader compilation support. If the intention is to just disable batching, use NoBatching instead." + ) = NoBatching +#endif - RhiShaderWanted = 0x1000 // // ### Qt 6: remove }; Q_DECLARE_FLAGS(Flags, Flag) @@ -68,12 +38,14 @@ public: virtual ~QSGMaterial(); virtual QSGMaterialType *type() const = 0; - virtual QSGMaterialShader *createShader() const = 0; + virtual QSGMaterialShader *createShader(QSGRendererInterface::RenderMode renderMode) const = 0; virtual int compare(const QSGMaterial *other) const; QSGMaterial::Flags flags() const { return m_flags; } void setFlag(Flags flags, bool on = true); + int viewCount() const; + private: Flags m_flags; void *m_reserved; |