diff options
| author | 2024-09-03 00:10:26 +0000 | |
|---|---|---|
| committer | 2024-09-03 00:10:26 +0000 | |
| commit | 77c75944ab2f6b993acc7bfa2ef2f68e4467fd7c (patch) | |
| tree | f2acd00e244d56ae1b8a2bd702a89cfa61187566 | |
| parent | eba33c3752a4813c8b37e7227aaf99140403e52e (diff) | |
| parent | 351a8df928e45f1c7ca6a47125a7c3d8deed8bc9 (diff) | |
Merge "Fix GetPhysicalDeviceSurfaceFormats2KHR for compression control struct handling" into main am: 351a8df928
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3242198
Change-Id: I0a5ae4151c9efd4823898bf7ffac3e7a2e357828
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | vulkan/libvulkan/swapchain.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/vulkan/libvulkan/swapchain.cpp b/vulkan/libvulkan/swapchain.cpp index 9e67725b58..f01d1d98b6 100644 --- a/vulkan/libvulkan/swapchain.cpp +++ b/vulkan/libvulkan/swapchain.cpp @@ -1215,8 +1215,15 @@ VkResult GetPhysicalDeviceSurfaceFormats2KHR( 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; |