Module: Mesa Branch: staging/20.0 Commit: dd7fdda487c355b59d6542596eb28f6e158029ec URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=dd7fdda487c355b59d6542596eb28f6e158029ec
Author: Abhishek Kumar <[email protected]> Date: Tue Apr 21 06:28:31 2020 +0000 anv/android: fix assert in anv_import_ahw_memory Commit fixes assert that triggers when running dEQP-VK.api.external.memory.android_hardware_buffer.dedicated.buffer#bind_export_import_bind on a debug build of Mesa. Fixes: c79a528d ("anv/android: support import/export of AHardwareBuffer objects") Signed-off-by: Abhishek Kumar <[email protected]> Reviewed-by: Tapani Pälli <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4655> (cherry picked from commit f06e4ab3190a0a715447c4df4017892adb8708dc) --- .pick_status.json | 2 +- src/intel/vulkan/anv_android.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 2a2a1df09f3..679f4e733f9 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -769,7 +769,7 @@ "description": "anv/android: fix assert in anv_import_ahw_memory", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "c79a528d2b58dfa6f3d856271cbf29697a5322a1" }, diff --git a/src/intel/vulkan/anv_android.c b/src/intel/vulkan/anv_android.c index 74b5b062286..b46a990b32e 100644 --- a/src/intel/vulkan/anv_android.c +++ b/src/intel/vulkan/anv_android.c @@ -308,7 +308,7 @@ anv_import_ahw_memory(VkDevice device_h, VkResult result = anv_device_import_bo(device, dma_buf, 0, 0 /* client_address */, &mem->bo); - assert(VK_SUCCESS); + assert(result == VK_SUCCESS); /* "If the vkAllocateMemory command succeeds, the implementation must * acquire a reference to the imported hardware buffer, which it must _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
