diff options
Diffstat (limited to 'src/gui/vulkan/qvulkanwindow.h')
| -rw-r--r-- | src/gui/vulkan/qvulkanwindow.h | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/vulkan/qvulkanwindow.h b/src/gui/vulkan/qvulkanwindow.h index a2b538ed54..537dbc4ae1 100644 --- a/src/gui/vulkan/qvulkanwindow.h +++ b/src/gui/vulkan/qvulkanwindow.h @@ -11,7 +11,7 @@ #pragma qt_sync_skip_header_check #endif -#if QT_CONFIG(vulkan) || defined(Q_CLANG_QDOC) +#if QT_CONFIG(vulkan) || defined(Q_QDOC) #include <QtGui/qvulkaninstance.h> #include <QtGui/qwindow.h> @@ -19,7 +19,7 @@ #include <QtGui/qmatrix4x4.h> #include <QtCore/qset.h> -#ifdef Q_CLANG_QDOC +#ifdef Q_QDOC typedef void* VkQueue; typedef void* VkCommandPool; typedef void* VkRenderPass; @@ -54,6 +54,14 @@ public: virtual void logicalDeviceLost(); }; +#ifndef VK_VERSION_1_1 +typedef struct VkPhysicalDeviceFeatures2 { + VkStructureType sType; + void* pNext; + VkPhysicalDeviceFeatures features; +} VkPhysicalDeviceFeatures2; +#endif + class Q_GUI_EXPORT QVulkanWindow : public QWindow { Q_OBJECT @@ -79,6 +87,8 @@ public: typedef std::function<void(VkPhysicalDeviceFeatures &)> EnabledFeaturesModifier; void setEnabledFeaturesModifier(const EnabledFeaturesModifier &modifier); + typedef std::function<void(VkPhysicalDeviceFeatures2 &)> EnabledFeatures2Modifier; + void setEnabledFeaturesModifier(EnabledFeatures2Modifier modifier); void setPreferredColorFormats(const QList<VkFormat> &formats); |