Module: Mesa Branch: staging/22.2 Commit: 4e0637a182f3f1e2356e0d028cff9f7c2f7b4e47 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4e0637a182f3f1e2356e0d028cff9f7c2f7b4e47
Author: Lionel Landwerlin <[email protected]> Date: Mon Aug 8 22:01:28 2022 +0300 anv: don't return incorrect error code for vkCreateDescriptorPool Signed-off-by: Lionel Landwerlin <[email protected]> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/7013 Cc: mesa-stable Reviewed-by: Jason Ekstrand <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17945> (cherry picked from commit 56bb29cb93accf9d78c29332db52314bcb4b7670) --- .pick_status.json | 2 +- src/intel/vulkan/anv_descriptor_set.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index fc8b49652e0..7c898d23ba0 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -58,7 +58,7 @@ "description": "anv: don't return incorrect error code for vkCreateDescriptorPool", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c index e05438f224b..c8fe93a9fbd 100644 --- a/src/intel/vulkan/anv_descriptor_set.c +++ b/src/intel/vulkan/anv_descriptor_set.c @@ -954,7 +954,7 @@ VkResult anv_CreateDescriptorPool( &pool->bo); if (result != VK_SUCCESS) { vk_object_free(&device->vk, pAllocator, pool); - return result; + return vk_error(device, VK_ERROR_OUT_OF_DEVICE_MEMORY); } util_vma_heap_init(&pool->bo_heap, POOL_HEAP_OFFSET, descriptor_bo_size);
