diff options
author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-25 10:28:26 +0100 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2021-03-29 11:58:52 +0100 |
commit | 69dcdbc8daa2c40397dd021fc31c47ad528d9d83 (patch) | |
tree | f54ed25c33f8a0960d21fafbf86d6de50639f320 /src/gui/vulkan/qvulkaninstance.h | |
parent | 76b3d024e45cc044bde2b6fb4b24849cf96b0012 (diff) |
Make getter const, add const overloads
The supportedApiVersions member is new in Qt 6.1, make it const.
We can't change supportedLayers and supportedExtensions, but we can
add const overloads that call the non-const version for now. This
way, those APIs can also be called on const QVulkanInstance
instances or references.
Addresses header review comment.
Pick-to: 6.1
Change-Id: Ie99d74f62cad72990b42566e56234b9c686e86de
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/vulkan/qvulkaninstance.h')
-rw-r--r-- | src/gui/vulkan/qvulkaninstance.h | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h index 3e597f9c87..bfdaf1ab69 100644 --- a/src/gui/vulkan/qvulkaninstance.h +++ b/src/gui/vulkan/qvulkaninstance.h @@ -174,9 +174,14 @@ public: }; 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(); - QVersionNumber supportedApiVersion(); + inline QVulkanInfoVector<QVulkanExtension> supportedExtensions() const + { return const_cast<QVulkanInstance*>(this)->supportedExtensions(); } + QVersionNumber supportedApiVersion() const; void setVkInstance(VkInstance existingVkInstance); |