diff options
Diffstat (limited to 'src/gui/vulkan/qvulkaninstance.h')
| -rw-r--r-- | src/gui/vulkan/qvulkaninstance.h | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h index 6fd5116aab..221f605fa2 100644 --- a/src/gui/vulkan/qvulkaninstance.h +++ b/src/gui/vulkan/qvulkaninstance.h @@ -11,12 +11,12 @@ #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 -#if !defined(Q_CLANG_QDOC) && __has_include(<vulkan/vulkan.h>) +#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 @@ -45,7 +45,7 @@ typedef int VkDebugReportObjectTypeEXT; // 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_CLANG_QDOC) +#if __has_include(<vulkan/vulkan.h>) || defined(Q_QDOC) #include <QtCore/qbytearraylist.h> #include <QtCore/qdebug.h> @@ -135,7 +135,8 @@ public: ~QVulkanInstance(); enum Flag { - NoDebugOutputRedirect = 0x01 + NoDebugOutputRedirect = 0x01, + NoPortabilityDrivers = 0x02 }; Q_DECLARE_FLAGS(Flags, Flag) @@ -202,9 +203,9 @@ public: }; Q_DECLARE_FLAGS(DebugMessageTypeFlags, DebugMessageTypeFlag) - typedef bool (*DebugUtilsFilter)(DebugMessageSeverityFlags severity, DebugMessageTypeFlags type, const void *callbackData); + using DebugUtilsFilter = std::function<bool(DebugMessageSeverityFlags severity, DebugMessageTypeFlags type, const void *message)>; void installDebugOutputFilter(DebugUtilsFilter filter); - void removeDebugOutputFilter(DebugUtilsFilter filter); + void clearDebugOutputFilters(); private: friend class QVulkanInstancePrivate; @@ -218,8 +219,8 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QVulkanInstance::DebugMessageSeverityFlags) QT_END_NAMESPACE -#endif // __has_include(<vulkan/vulkan.h>) || defined(Q_CLANG_QDOC) +#endif // __has_include(<vulkan/vulkan.h>) || defined(Q_QDOC) -#endif // QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#endif // QT_CONFIG(vulkan) || defined(Q_QDOC) #endif // QVULKANINSTANCE_H |