commit 351a8df928e45f1c7ca6a47125a7c3d8deed8bc9
author Tom Murphy <tomnom@google.com> Tue Sep 03 00:05:48 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Sep 03 00:05:48 2024 +0000
tree c532c805a61db91129a56690b896293c4d85808b
parent 16fbe775c0fe5b57bd96b3122d690d7c34da9ed9
parent 7e7812eda2e60f269808e04b51fdfff4832647ab

Merge "Fix GetPhysicalDeviceSurfaceFormats2KHR for compression control struct handling" into main

vulkan/libvulkan/swapchain.cpp

diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp
index 1314193..f15fe4d 100644
--- a/vulkan/libvulkan/swapchain.cpp
+++ b/vulkan/libvulkan/swapchain.cpp
@@ -1225,8 +1225,15 @@
                             surfaceCompressionProps
                                 ->imageCompressionFixedRateFlags =
                                 compressionProps.imageCompressionFixedRateFlags;
-                        } else {
+                        } else if (compressionRes ==
+                                       VK_ERROR_OUT_OF_HOST_MEMORY ||
+                                   compressionRes ==
+                                       VK_ERROR_OUT_OF_DEVICE_MEMORY) {
                             return compressionRes;
+                        } else {
+                            // For any of the *_NOT_SUPPORTED errors we continue
+                            // onto the next format
+                            continue;
                         }
                     }
                 } break;