fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 06:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

lavapipe: Allocate descriptor set layouts with DEVICE scope

Browse source 
Because they can come and go at any time, we can't use OBJECT scope
because that might confuse the client allocator.  Instead, use DEVICE
scope and always allocate off the device allocator.

Reviewed-by: Boris Brezillon <boris.brezillon@collabora.com>
Reviewed-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15329>
This commit is contained in:
Jason Ekstrand 2022-03-10 10:52:07 -06:00 • committed by Marge Bot
parent 94ea3b9c03
commit 48a10c5dd3
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gallium/frontends/lavapipe/lvp_descriptor_set.c
View file

@ -62,8 +62,8 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorSetLayout(
num_bindings * sizeof(set_layout->binding[0]) +
immutable_sampler_count * sizeof(struct lvp_sampler *);
set_layout = vk_zalloc2(&device->vk.alloc, pAllocator, size, 8,
VK_SYSTEM_ALLOCATION_SCOPE_OBJECT);
set_layout = vk_zalloc(&device->vk.alloc, size, 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
if (!set_layout)
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
@ -74,7 +74,6 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorSetLayout(
struct lvp_sampler **samplers =
(struct lvp_sampler **)&set_layout->binding[num_bindings];
set_layout->alloc = pAllocator;
set_layout->binding_count = num_bindings;
set_layout->shader_stages = 0;
set_layout->size = 0;
@ -85,7 +84,7 @@ VKAPI_ATTR VkResult VKAPI_CALL lvp_CreateDescriptorSetLayout(
&bindings);
if (result != VK_SUCCESS) {
vk_object_base_finish(&set_layout->base);
vk_free2(&device->vk.alloc, pAllocator, set_layout);
vk_free(&device->vk.alloc, set_layout);
return vk_error(device, result);
}
@ -187,7 +186,7 @@ lvp_descriptor_set_layout_destroy(struct lvp_device *device,
{
assert(layout->ref_cnt == 0);
vk_object_base_finish(&layout->base);
vk_free2(&device->vk.alloc, layout->alloc, layout);
vk_free(&device->vk.alloc, layout);
}
VKAPI_ATTR void VKAPI_CALL lvp_DestroyDescriptorSetLayout(

1
src/gallium/frontends/lavapipe/lvp_private.h
View file

@ -341,7 +341,6 @@ struct lvp_descriptor_set_binding_layout {
struct lvp_descriptor_set_layout {
struct vk_object_base base;
const VkAllocationCallbacks *alloc;
/* Descriptor set layouts can be destroyed at almost any time */
uint32_t ref_cnt;