diff options
Diffstat (limited to 'src/gui/vulkan/qvulkandefaultinstance.cpp')
| -rw-r--r-- | src/gui/vulkan/qvulkandefaultinstance.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/vulkan/qvulkandefaultinstance.cpp b/src/gui/vulkan/qvulkandefaultinstance.cpp index 7d6c478b4a..b4f343cf17 100644 --- a/src/gui/vulkan/qvulkandefaultinstance.cpp +++ b/src/gui/vulkan/qvulkandefaultinstance.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qvulkandefaultinstance_p.h" -#include <private/qrhivulkan_p.h> +#include <rhi/qrhi.h> #include <QLoggingCategory> QT_BEGIN_NAMESPACE @@ -10,7 +10,7 @@ QT_BEGIN_NAMESPACE Q_LOGGING_CATEGORY(lcGuiVk, "qt.vulkan") static QVulkanInstance *s_vulkanInstance; -static QVulkanDefaultInstance::Flags s_vulkanInstanceFlags; +Q_CONSTINIT static QVulkanDefaultInstance::Flags s_vulkanInstanceFlags; QVulkanDefaultInstance::Flags QVulkanDefaultInstance::flags() { @@ -57,7 +57,7 @@ QVulkanInstance *QVulkanDefaultInstance::instance() else if (supportedVersion >= QVersionNumber(1, 2)) s_vulkanInstance->setApiVersion(QVersionNumber(1, 2)); else if (supportedVersion >= QVersionNumber(1, 1)) - s_vulkanInstance->setApiVersion(QVersionNumber(1, 2)); + s_vulkanInstance->setApiVersion(QVersionNumber(1, 1)); qCDebug(lcGuiVk) << "QVulkanDefaultInstance: Creating Vulkan instance" << "Requesting Vulkan API" << s_vulkanInstance->apiVersion() << "Instance-level version was reported as" << supportedVersion; |