commit 24abf357b8b64c4f5dabcae36092ce5caa639bd4
author Trevor Black <vantablack@google.com> Thu Nov 17 20:43:01 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Nov 17 20:43:01 2022 +0000
tree 5efbcb1c27859efcedf4b365d098be4665019ea9
parent 9de12854cbf36bd1e194b3100d39ff43247d8b64
parent e4529b1a40e49118b30843a146b1b46a1fc299d9

Merge "Set the maxImageExtent for vk wsi based on currentExtent" am: cc9d788959 am: e4529b1a40

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/2303377

Change-Id: If6071fed281fa2578d8ab2a5697bc46163a07dc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 83bc655..48a75c5 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -715,6 +715,17 @@
     capabilities->minImageExtent = VkExtent2D{1, 1};
     capabilities->maxImageExtent = VkExtent2D{4096, 4096};
 
+    if (capabilities->maxImageExtent.height <
+        capabilities->currentExtent.height) {
+        capabilities->maxImageExtent.height =
+            capabilities->currentExtent.height;
+    }
+
+    if (capabilities->maxImageExtent.width <
+        capabilities->currentExtent.width) {
+        capabilities->maxImageExtent.width = capabilities->currentExtent.width;
+    }
+
     capabilities->maxImageArrayLayers = 1;
 
     capabilities->supportedTransforms = kSupportedTransforms;