From b0830e911e44e5779d2c06190820ee51f9296e1b Mon Sep 17 00:00:00 2001 From: Roman Stratiienko Date: Sat, 2 Sep 2023 22:00:32 +0300 Subject: [PATCH] v3dv/android: Skip swapchain binding MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ANV functionality was used as a reference. As stated in anv_BindImageMemory2: Ignore this struct on Android, we cannot access swapchain structures there. Fixes 2 failing VTS test: dEQP-VK.wsi.android.swapchain.create#image_swapchain_create_info dEQP-VK.wsi.android.swapchain.simulate_oom#image_swapchain_create_info Signed-off-by: Roman Stratiienko Reviewed-by: Alejandro Piñeiro Part-of: --- src/broadcom/vulkan/v3dv_device.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/broadcom/vulkan/v3dv_device.c b/src/broadcom/vulkan/v3dv_device.c index 096d1a9e8e1..9214fc5b70e 100644 --- a/src/broadcom/vulkan/v3dv_device.c +++ b/src/broadcom/vulkan/v3dv_device.c @@ -2668,11 +2668,11 @@ v3dv_BindImageMemory2(VkDevice _device, const VkBindImageMemoryInfo *pBindInfos) { for (uint32_t i = 0; i < bindInfoCount; i++) { -#ifndef ANDROID const VkBindImageMemorySwapchainInfoKHR *swapchain_info = vk_find_struct_const(pBindInfos->pNext, BIND_IMAGE_MEMORY_SWAPCHAIN_INFO_KHR); if (swapchain_info && swapchain_info->swapchain) { +#ifndef ANDROID struct v3dv_image *swapchain_image = v3dv_wsi_get_image_from_swapchain(swapchain_info->swapchain, swapchain_info->imageIndex); @@ -2685,8 +2685,8 @@ v3dv_BindImageMemory2(VkDevice _device, .memoryOffset = swapchain_image->planes[0].mem_offset, }; bind_image_memory(&swapchain_bind); - } else #endif + } else { bind_image_memory(&pBindInfos[i]); }