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

v3dv: ref/unref pipeline layout objects

Browse source 
Since KHR_maintenance4 it is possible to destroy pipeline layouts
immediately after creating pipelines.

Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18246>
This commit is contained in:
Iago Toral Quiroga 2022-08-25 08:23:27 +02:00 • committed by Marge Bot
parent 425f8aa7a4
commit 14dab6b10c
3 changed files with 33 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/broadcom/vulkan/v3dv_descriptor_set.c
View file

@ -339,6 +339,7 @@ v3dv_CreatePipelineLayout(VkDevice _device,
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
layout->num_sets = pCreateInfo->setLayoutCount;
layout->ref_cnt = 1;
uint32_t dynamic_offset_count = 0;
for (uint32_t set = 0; set < pCreateInfo->setLayoutCount; set++) {
@ -405,7 +406,7 @@ v3dv_DestroyPipelineLayout(VkDevice _device,
if (!pipeline_layout)
return;
v3dv_pipeline_layout_destroy(device, pipeline_layout, pAllocator);
v3dv_pipeline_layout_unref(device, pipeline_layout, pAllocator);
}
VKAPI_ATTR VkResult VKAPI_CALL

9
src/broadcom/vulkan/v3dv_pipeline.c
View file

@ -150,6 +150,9 @@ v3dv_destroy_pipeline(struct v3dv_pipeline *pipeline,
if (pipeline->executables.mem_ctx)
ralloc_free(pipeline->executables.mem_ctx);
if (pipeline->layout)
v3dv_pipeline_layout_unref(device, pipeline->layout, pAllocator);
vk_object_free(&device->vk, pAllocator, pipeline);
}
@ -3025,6 +3028,8 @@ pipeline_init(struct v3dv_pipeline *pipeline,
/* This must be done after the pipeline has been compiled */
pipeline_set_ez_state(pipeline, ds_info);
v3dv_pipeline_layout_ref(pipeline->layout);
return result;
}
@ -3265,6 +3270,10 @@ compute_pipeline_init(struct v3dv_pipeline *pipeline,
pipeline->layout = layout;
VkResult result = pipeline_compile_compute(pipeline, cache, info, alloc);
if (result != VK_SUCCESS)
return result;
v3dv_pipeline_layout_ref(pipeline->layout);
return result;
}

22
src/broadcom/vulkan/v3dv_private.h
View file

@ -1842,6 +1842,11 @@ struct v3dv_pipeline_layout {
uint32_t dynamic_offset_count;
uint32_t push_constant_size;
/* Pipeline layouts can be destroyed after creating pipelines since
* maintenance4.
*/
uint32_t ref_cnt;
unsigned char sha1[20];
};
@ -1850,6 +1855,23 @@ v3dv_pipeline_layout_destroy(struct v3dv_device *device,
struct v3dv_pipeline_layout *layout,
const VkAllocationCallbacks *alloc);
static inline void
v3dv_pipeline_layout_ref(struct v3dv_pipeline_layout *layout)
{
assert(layout && layout->ref_cnt >= 1);
p_atomic_inc(&layout->ref_cnt);
}
static inline void
v3dv_pipeline_layout_unref(struct v3dv_device *device,
struct v3dv_pipeline_layout *layout,
const VkAllocationCallbacks *alloc)
{
assert(layout && layout->ref_cnt >= 1);
if (p_atomic_dec_zero(&layout->ref_cnt))
v3dv_pipeline_layout_destroy(device, layout, alloc);
}
/*
* We are using descriptor maps for ubo/ssbo and texture/samplers, so we need
* it to be big enough to include the max value for all of them.