diff options
Diffstat (limited to 'src/quick/items/qquickgraphicsinfo_p.h')
-rw-r--r-- | src/quick/items/qquickgraphicsinfo_p.h | 66 |
1 files changed, 23 insertions, 43 deletions
diff --git a/src/quick/items/qquickgraphicsinfo_p.h b/src/quick/items/qquickgraphicsinfo_p.h index 9ef7bacb3e..a18694a83b 100644 --- a/src/quick/items/qquickgraphicsinfo_p.h +++ b/src/quick/items/qquickgraphicsinfo_p.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2016 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) 2021 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 QQUICKGRAPHICSINFO_P_H #define QQUICKGRAPHICSINFO_P_H @@ -56,6 +20,7 @@ #include <QtQml/qqml.h> #include <QtGui/qsurfaceformat.h> #include <QtQuick/qsgrendererinterface.h> +#include <QtCore/private/qglobal_p.h> QT_BEGIN_NAMESPACE @@ -75,19 +40,36 @@ class QQuickGraphicsInfo : public QObject Q_PROPERTY(OpenGLContextProfile profile READ profile NOTIFY profileChanged FINAL) Q_PROPERTY(RenderableType renderableType READ renderableType NOTIFY renderableTypeChanged FINAL) + QML_NAMED_ELEMENT(GraphicsInfo) + QML_ADDED_IN_VERSION(2, 8) + QML_UNCREATABLE("GraphicsInfo is only available via attached properties.") + QML_ATTACHED(QQuickGraphicsInfo) + public: enum GraphicsApi { Unknown = QSGRendererInterface::Unknown, Software = QSGRendererInterface::Software, + OpenVG = QSGRendererInterface::OpenVG, OpenGL = QSGRendererInterface::OpenGL, - Direct3D12 = QSGRendererInterface::Direct3D12 + Direct3D11 = QSGRendererInterface::Direct3D11, + Vulkan = QSGRendererInterface::Vulkan, + Metal = QSGRendererInterface::Metal, + Null = QSGRendererInterface::Null, + Direct3D12 = QSGRendererInterface::Direct3D12, + + OpenGLRhi = QSGRendererInterface::OpenGLRhi, + Direct3D11Rhi = QSGRendererInterface::Direct3D11Rhi, + VulkanRhi = QSGRendererInterface::VulkanRhi, + MetalRhi = QSGRendererInterface::MetalRhi, + NullRhi = QSGRendererInterface::NullRhi }; Q_ENUM(GraphicsApi) enum ShaderType { UnknownShadingLanguage = QSGRendererInterface::UnknownShadingLanguage, GLSL = QSGRendererInterface::GLSL, - HLSL = QSGRendererInterface::HLSL + HLSL = QSGRendererInterface::HLSL, + RhiShader = QSGRendererInterface::RhiShader }; Q_ENUM(ShaderType) @@ -118,7 +100,7 @@ public: }; Q_ENUM(RenderableType) - QQuickGraphicsInfo(QQuickItem *item = 0); + QQuickGraphicsInfo(QQuickItem *item = nullptr); static QQuickGraphicsInfo *qmlAttachedProperties(QObject *object); @@ -161,6 +143,4 @@ private: QT_END_NAMESPACE -QML_DECLARE_TYPEINFO(QQuickGraphicsInfo, QML_HAS_ATTACHED_PROPERTIES) - #endif // QQUICKGRAPHICSINFO_P_H |