diff options
Diffstat (limited to 'src/gui/vulkan/qvulkaninstance.h')
| -rw-r--r-- | src/gui/vulkan/qvulkaninstance.h | 124 |
1 files changed, 71 insertions, 53 deletions
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h index 5b3db9a4c8..221f605fa2 100644 --- a/src/gui/vulkan/qvulkaninstance.h +++ b/src/gui/vulkan/qvulkaninstance.h @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the QtGui 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) 2017 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 QVULKANINSTANCE_H #define QVULKANINSTANCE_H @@ -44,28 +8,51 @@ #if 0 #pragma qt_no_master_include +#pragma qt_sync_skip_header_check #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #ifndef VK_NO_PROTOTYPES #define VK_NO_PROTOTYPES #endif -#ifndef Q_CLANG_QDOC +#if !defined(Q_QDOC) && __has_include(<vulkan/vulkan.h>) #include <vulkan/vulkan.h> #else +// QT_CONFIG(vulkan) implies vulkan.h being available at Qt build time, but it +// does not guarantee vulkan.h is available at *application* build time. Both +// for qdoc and for apps built on systems without Vulkan SDK we provide a set +// of typedefs to keep things compiling since this header may be included from +// Qt Quick and elsewhere just to get types like VkImage and friends defined. + typedef void* PFN_vkVoidFunction; -typedef unsigned long VkSurfaceKHR; -typedef unsigned long VkImage; -typedef unsigned long VkImageView; +// non-dispatchable handles (64-bit regardless of arch) +typedef quint64 VkSurfaceKHR; +typedef quint64 VkImage; +typedef quint64 VkImageView; +// dispatchable handles (32 or 64-bit depending on arch) +typedef void* VkInstance; +typedef void* VkPhysicalDevice; +typedef void* VkDevice; +// enums +typedef int VkResult; +typedef int VkFormat; +typedef int VkImageLayout; +typedef int VkDebugReportFlagsEXT; +typedef int VkDebugReportObjectTypeEXT; #endif +// QVulkanInstance itself is only applicable if vulkan.h is available, or if +// it's qdoc. An application that is built on a vulkan.h-less system against a +// Vulkan-enabled Qt gets the dummy typedefs but not QVulkan*. +#if __has_include(<vulkan/vulkan.h>) || defined(Q_QDOC) + +#include <QtCore/qbytearraylist.h> +#include <QtCore/qdebug.h> #include <QtCore/qhashfunctions.h> +#include <QtCore/qlist.h> #include <QtCore/qscopedpointer.h> -#include <QtCore/qvector.h> -#include <QtCore/qbytearraylist.h> #include <QtCore/qversionnumber.h> -#include <QtCore/qdebug.h> QT_BEGIN_NAMESPACE @@ -82,7 +69,7 @@ struct QVulkanLayer QVersionNumber specVersion; QByteArray description; }; -Q_DECLARE_TYPEINFO(QVulkanLayer, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVulkanLayer, Q_RELOCATABLE_TYPE); inline bool operator==(const QVulkanLayer &lhs, const QVulkanLayer &rhs) noexcept { @@ -91,7 +78,7 @@ inline bool operator==(const QVulkanLayer &lhs, const QVulkanLayer &rhs) noexcep inline bool operator!=(const QVulkanLayer &lhs, const QVulkanLayer &rhs) noexcept { return !(lhs == rhs); } -inline uint qHash(const QVulkanLayer &key, uint seed = 0) noexcept +inline size_t qHash(const QVulkanLayer &key, size_t seed = 0) noexcept { QtPrivate::QHashCombine hash; seed = hash(seed, key.name); @@ -105,7 +92,7 @@ struct QVulkanExtension QByteArray name; uint32_t version; }; -Q_DECLARE_TYPEINFO(QVulkanExtension, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QVulkanExtension, Q_RELOCATABLE_TYPE); inline bool operator==(const QVulkanExtension &lhs, const QVulkanExtension &rhs) noexcept { @@ -114,7 +101,7 @@ inline bool operator==(const QVulkanExtension &lhs, const QVulkanExtension &rhs) inline bool operator!=(const QVulkanExtension &lhs, const QVulkanExtension &rhs) noexcept { return !(lhs == rhs); } -inline uint qHash(const QVulkanExtension &key, uint seed = 0) noexcept +inline size_t qHash(const QVulkanExtension &key, size_t seed = 0) noexcept { QtPrivate::QHashCombine hash; seed = hash(seed, key.name); @@ -128,7 +115,7 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QVulkanExtension &); #endif template<typename T> -class QVulkanInfoVector : public QVector<T> +class QVulkanInfoVector : public QList<T> { public: bool contains(const QByteArray &name) const { @@ -148,12 +135,19 @@ public: ~QVulkanInstance(); enum Flag { - NoDebugOutputRedirect = 0x01 + NoDebugOutputRedirect = 0x01, + NoPortabilityDrivers = 0x02 }; Q_DECLARE_FLAGS(Flags, Flag) + // ### Qt 7: remove non-const overloads QVulkanInfoVector<QVulkanLayer> supportedLayers(); + inline QVulkanInfoVector<QVulkanLayer> supportedLayers() const + { return const_cast<QVulkanInstance*>(this)->supportedLayers(); } QVulkanInfoVector<QVulkanExtension> supportedExtensions(); + inline QVulkanInfoVector<QVulkanExtension> supportedExtensions() const + { return const_cast<QVulkanInstance*>(this)->supportedExtensions(); } + QVersionNumber supportedApiVersion() const; void setVkInstance(VkInstance existingVkInstance); @@ -194,15 +188,39 @@ public: void installDebugOutputFilter(DebugFilter filter); void removeDebugOutputFilter(DebugFilter filter); + enum DebugMessageSeverityFlag { + VerboseSeverity = 0x01, + InfoSeverity = 0x02, + WarningSeverity = 0x04, + ErrorSeverity = 0x08 + }; + Q_DECLARE_FLAGS(DebugMessageSeverityFlags, DebugMessageSeverityFlag) + + enum DebugMessageTypeFlag { + GeneralMessage = 0x01, + ValidationMessage = 0x02, + PerformanceMessage = 0x04 + }; + Q_DECLARE_FLAGS(DebugMessageTypeFlags, DebugMessageTypeFlag) + + using DebugUtilsFilter = std::function<bool(DebugMessageSeverityFlags severity, DebugMessageTypeFlags type, const void *message)>; + void installDebugOutputFilter(DebugUtilsFilter filter); + void clearDebugOutputFilters(); + private: + friend class QVulkanInstancePrivate; QScopedPointer<QVulkanInstancePrivate> d_ptr; Q_DISABLE_COPY(QVulkanInstance) }; Q_DECLARE_OPERATORS_FOR_FLAGS(QVulkanInstance::Flags) +Q_DECLARE_OPERATORS_FOR_FLAGS(QVulkanInstance::DebugMessageTypeFlags) +Q_DECLARE_OPERATORS_FOR_FLAGS(QVulkanInstance::DebugMessageSeverityFlags) QT_END_NAMESPACE -#endif // QT_CONFIG(vulkan) +#endif // __has_include(<vulkan/vulkan.h>) || defined(Q_QDOC) + +#endif // QT_CONFIG(vulkan) || defined(Q_QDOC) #endif // QVULKANINSTANCE_H |