fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-04 00:30:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radv: Stop printing descriptor pool allocation failures

Browse source 
The VK_ERROR_FRAGMENTED_POOL and VK_ERROR_OUT_OF_POOL_MEMORY errors are
not as exceptional cases as most.  These are expected to be hit by
applications in the normal course of doing their thing.  Probably best
not to spam stderr and the debug logs with them.

Reviewed-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13045>
This commit is contained in:
Jason Ekstrand 2021-10-06 09:18:42 -05:00 • committed by Marge Bot
parent 88a8b937b5
commit 9e299b50ab
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/amd/vulkan/radv_descriptor_set.c
View file

@ -563,7 +563,7 @@ radv_descriptor_set_create(struct radv_device *device, struct radv_descriptor_po
if (pool->host_memory_base) {
if (pool->host_memory_end - pool->host_memory_ptr < mem_size)
return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY);
return VK_ERROR_OUT_OF_POOL_MEMORY;
set = (struct radv_descriptor_set *)pool->host_memory_ptr;
pool->host_memory_ptr += mem_size;
@ -600,7 +600,7 @@ radv_descriptor_set_create(struct radv_device *device, struct radv_descriptor_po
if (!pool->host_memory_base && pool->entry_count == pool->max_entry_count) {
vk_free2(&device->vk.alloc, NULL, set);
return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY);
return VK_ERROR_OUT_OF_POOL_MEMORY;
}
/* try to allocate linearly first, so that we don't spend
@ -629,7 +629,7 @@ radv_descriptor_set_create(struct radv_device *device, struct radv_descriptor_po
if (pool->size - offset < layout_size) {
vk_free2(&device->vk.alloc, NULL, set);
return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY);
return VK_ERROR_OUT_OF_POOL_MEMORY;
}
set->header.bo = pool->bo;
set->header.mapped_ptr = (uint32_t *)(pool->mapped_ptr + offset);
@ -641,7 +641,7 @@ radv_descriptor_set_create(struct radv_device *device, struct radv_descriptor_po
pool->entries[index].set = set;
pool->entry_count++;
} else
return vk_error(device->instance, VK_ERROR_OUT_OF_POOL_MEMORY);
return VK_ERROR_OUT_OF_POOL_MEMORY;
if (layout->has_immutable_samplers) {
for (unsigned i = 0; i < layout->binding_count; ++i) {