From a5619e19f917e79f4d383ded8d6bc9ba4b5d2148 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Mon, 15 Aug 2022 12:30:36 +0200 Subject: [PATCH] rhi: Fix instance API version when only 1.1 is supported Looks like something inherited from the Qt Quick code that got moved into the helper. Setting a request of API version 1.2 is harmless in practice, but to be correct the version should be 1.1 when 1.2 and newer are not reported by the instance. Change-Id: I62d2c143972d6753e4311c6907ccf846ae0e9088 Reviewed-by: Andy Nichols (cherry picked from commit 73fe9a786c119a5763ae0ce9dd0575c088e0f29b) Reviewed-by: Qt Cherry-pick Bot --- src/gui/vulkan/qvulkandefaultinstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/vulkan/qvulkandefaultinstance.cpp b/src/gui/vulkan/qvulkandefaultinstance.cpp index c1068576916..c12fde94641 100644 --- a/src/gui/vulkan/qvulkandefaultinstance.cpp +++ b/src/gui/vulkan/qvulkandefaultinstance.cpp @@ -55,7 +55,7 @@ QVulkanInstance *QVulkanDefaultInstance::instance() 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;