Mesa (master): anv: Return better errors from AllocateDescriptorSets

Jason Ekstrand jekstrand at kemper.freedesktop.org
Tue Jan 24 20:27:58 UTC 2017


Module: Mesa
Branch: master
Commit: 756533520e1cd246065d18ebdcd87dccf7910681
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=756533520e1cd246065d18ebdcd87dccf7910681

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Sat Jan 21 07:40:22 2017 -0800

anv: Return better errors from AllocateDescriptorSets

Reviewed-by: Iago Toral Quiroga <itoral at igalia.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

---

 src/intel/vulkan/anv_descriptor_set.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/intel/vulkan/anv_descriptor_set.c b/src/intel/vulkan/anv_descriptor_set.c
index a5e65af..a4b7638 100644
--- a/src/intel/vulkan/anv_descriptor_set.c
+++ b/src/intel/vulkan/anv_descriptor_set.c
@@ -432,8 +432,13 @@ anv_descriptor_set_create(struct anv_device *device,
       }
    }
 
-   if (set == NULL)
-      return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
+   if (set == NULL) {
+      if (pool->free_list != EMPTY) {
+         return vk_error(VK_ERROR_FRAGMENTED_POOL);
+      } else {
+         return vk_error(VK_ERROR_OUT_OF_POOL_MEMORY_KHR);
+      }
+   }
 
    set->size = size;
    set->layout = layout;




More information about the mesa-commit mailing list