From 0d7f2dfa1c4c0bae82643cd3cc90b1439f81b490 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 21 Sep 2023 10:34:40 +0200 Subject: [PATCH] vkkhrdisplay: Fix output selection MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit While this platform plugin does not have full multi-screen support, it at least has the ability to choose the one to use via env.vars. This currently does not work. What's more, it looks like it chooses the last display by default, instead of the first. Fix the display/display-mode logic. This now allows QT_VK_DISPLAY_INDEX to work correctly, for example on a RPi4 with two screens connected. Fixes: QTBUG-117416 Change-Id: Ia5ac8fde5827b3a2e1945e8e4f04fb8dd90704e2 Pick-to: 6.5 Reviewed-by: Christian Strømme Reviewed-by: Kristoffer Skau (cherry picked from commit 66be69139ce15be5df800e93a4702891fa8d6fb3) Reviewed-by: Qt Cherry-pick Bot --- .../platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp index 4d58e4154ef..2e8d60209e2 100644 --- a/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp +++ b/src/plugins/platforms/vkkhrdisplay/qvkkhrdisplayvulkaninstance.cpp @@ -143,7 +143,7 @@ bool QVkKhrDisplayVulkanInstance::chooseDisplay() j, (void *) mode.displayMode, mode.parameters.visibleRegion.width, mode.parameters.visibleRegion.height, mode.parameters.refreshRate); - if (j == wantedModeIndex) { + if (j == wantedModeIndex && i == wantedDisplayIndex) { m_displayMode = mode.displayMode; m_width = mode.parameters.visibleRegion.width; m_height = mode.parameters.visibleRegion.height;