summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/gui/vulkan/qvulkaninstance.cpp12
-rw-r--r--src/gui/vulkan/qvulkaninstance.h7
2 files changed, 17 insertions, 2 deletions
diff --git a/src/gui/vulkan/qvulkaninstance.cpp b/src/gui/vulkan/qvulkaninstance.cpp
index 538a59c28f5..fc4a916cb43 100644
--- a/src/gui/vulkan/qvulkaninstance.cpp
+++ b/src/gui/vulkan/qvulkaninstance.cpp
@@ -428,20 +428,30 @@ QVulkanInstance::~QVulkanInstance()
*/
/*!
+ \fn QVulkanInfoVector<QVulkanLayer> QVulkanInstance::supportedLayers() const
\return the list of supported instance-level layers.
\note This function can be called before create().
*/
+
+/*!
+ \internal
+ */
QVulkanInfoVector<QVulkanLayer> QVulkanInstance::supportedLayers()
{
return d_ptr->ensureVulkan() ? d_ptr->platformInst->supportedLayers() : QVulkanInfoVector<QVulkanLayer>();
}
/*!
+ \fn QVulkanInfoVector<QVulkanExtension> QVulkanInstance::supportedExtensions() const
\return the list of supported instance-level extensions.
\note This function can be called before create().
*/
+
+/*!
+ \internal
+ */
QVulkanInfoVector<QVulkanExtension> QVulkanInstance::supportedExtensions()
{
return d_ptr->ensureVulkan() ? d_ptr->platformInst->supportedExtensions() : QVulkanInfoVector<QVulkanExtension>();
@@ -464,7 +474,7 @@ QVulkanInfoVector<QVulkanExtension> QVulkanInstance::supportedExtensions()
\sa setApiVersion()
*/
-QVersionNumber QVulkanInstance::supportedApiVersion()
+QVersionNumber QVulkanInstance::supportedApiVersion() const
{
return d_ptr->ensureVulkan() ? d_ptr->platformInst->supportedApiVersion() : QVersionNumber();
}
diff --git a/src/gui/vulkan/qvulkaninstance.h b/src/gui/vulkan/qvulkaninstance.h
index 3e597f9c870..bfdaf1ab691 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);