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

anv: reuse runtime descriptor set layout base object

Browse source 
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Caio Oliveira <caio.oliveira@intel.com>
Reviewed-by: Ivan Briano <ivan.briano@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36457>
This commit is contained in:
Lionel Landwerlin 2024-08-05 21:22:19 +03:00 • committed by Marge Bot
parent e43ef6533b
commit fcd06aa8c3
2 changed files with 16 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/intel/vulkan/anv_descriptor_set.c
View file

@ -671,11 +671,9 @@ VkResult anv_CreateDescriptorSetLayout(
VK_MULTIALLOC_DECL(&ma, struct anv_descriptor_set_layout_sampler, samplers,
immutable_sampler_count);
if (!vk_object_multizalloc(&device->vk, &ma, NULL,
VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT))
if (!vk_descriptor_set_layout_multizalloc(&device->vk, &ma, pCreateInfo))
return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY);
set_layout->ref_cnt = 1;
set_layout->binding_count = num_bindings;
set_layout->flags = pCreateInfo->flags;
set_layout->type = anv_descriptor_set_layout_type_for_flags(device->physical,
@ -914,14 +912,6 @@ VkResult anv_CreateDescriptorSetLayout(
return VK_SUCCESS;
}
void
anv_descriptor_set_layout_destroy(struct anv_device *device,
struct anv_descriptor_set_layout *layout)
{
assert(layout->ref_cnt == 0);
vk_object_free(&device->vk, NULL, layout);
}
static const struct anv_descriptor_set_binding_layout *
set_layout_dynamic_binding(const struct anv_descriptor_set_layout *set_layout)
{
@ -1024,7 +1014,7 @@ void anv_DestroyDescriptorSetLayout(
if (!set_layout)
return;
anv_descriptor_set_layout_unref(device, set_layout);
vk_descriptor_set_layout_unref(&device->vk, &set_layout->vk);
}
void
@ -1139,8 +1129,8 @@ anv_pipeline_sets_layout_add(struct anv_pipeline_sets_layout *layout,
layout->num_sets = MAX2(set_idx + 1, layout->num_sets);
layout->set[set_idx].layout =
anv_descriptor_set_layout_ref(set_layout);
layout->set[set_idx].layout = set_layout;
vk_descriptor_set_layout_ref(&set_layout->vk);
layout->set[set_idx].dynamic_offset_start = layout->num_dynamic_buffers;
layout->num_dynamic_buffers += set_layout->dynamic_offset_count;
@ -1189,7 +1179,8 @@ anv_pipeline_sets_layout_fini(struct anv_pipeline_sets_layout *layout)
if (!layout->set[s].layout)
continue;
anv_descriptor_set_layout_unref(layout->device, layout->set[s].layout);
vk_descriptor_set_layout_unref(&layout->device->vk,
&layout->set[s].layout->vk);
}
}
@ -1591,7 +1582,7 @@ void anv_DestroyDescriptorPool(
list_for_each_entry_safe(struct anv_descriptor_set, set,
&pool->desc_sets, pool_link) {
anv_descriptor_set_layout_unref(device, set->layout);
vk_descriptor_set_layout_unref(&device->vk, &set->layout->vk);
}
util_vma_heap_finish(&pool->host_heap);
@ -1614,7 +1605,7 @@ VkResult anv_ResetDescriptorPool(
list_for_each_entry_safe(struct anv_descriptor_set, set,
&pool->desc_sets, pool_link) {
anv_descriptor_set_layout_unref(device, set->layout);
vk_descriptor_set_layout_unref(&device->vk, &set->layout->vk);
}
list_inithead(&pool->desc_sets);
@ -1806,7 +1797,7 @@ anv_descriptor_set_create(struct anv_device *device,
set->pool = pool;
set->layout = layout;
anv_descriptor_set_layout_ref(layout);
vk_descriptor_set_layout_ref(&layout->vk);
set->buffer_view_count =
set_layout_buffer_view_count(layout, var_desc_count);
@ -1879,7 +1870,7 @@ anv_descriptor_set_destroy(struct anv_device *device,
struct anv_descriptor_pool *pool,
struct anv_descriptor_set *set)
{
anv_descriptor_set_layout_unref(device, set->layout);
vk_descriptor_set_layout_unref(&device->vk, &set->layout->vk);
if (set->desc_surface_mem.alloc_size) {
anv_descriptor_pool_heap_free(device, pool, &pool->surfaces, set, set->desc_surface_mem);
@ -2003,7 +1994,7 @@ anv_push_descriptor_set_init(struct anv_cmd_buffer *cmd_buffer,
if (set->layout != layout) {
if (set->layout) {
anv_descriptor_set_layout_unref(cmd_buffer->device, set->layout);
vk_descriptor_set_layout_unref(&cmd_buffer->device->vk, &set->layout->vk);
} else {
/* one-time initialization */
vk_object_base_init(&cmd_buffer->device->vk, &set->base,
@ -2012,7 +2003,7 @@ anv_push_descriptor_set_init(struct anv_cmd_buffer *cmd_buffer,
set->buffer_views = push_set->buffer_views;
}
anv_descriptor_set_layout_ref(layout);
vk_descriptor_set_layout_ref(&layout->vk);
set->layout = layout;
set->generate_surface_states = 0;
}
@ -2117,9 +2108,7 @@ anv_push_descriptor_set_finish(struct anv_push_descriptor_set *push_set)
{
struct anv_descriptor_set *set = &push_set->set;
if (set->layout) {
struct anv_device *device =
container_of(set->base.device, struct anv_device, vk);
anv_descriptor_set_layout_unref(device, set->layout);
vk_descriptor_set_layout_unref(set->base.device, &set->layout->vk);
}
}

29
src/intel/vulkan/anv_private.h
View file

@ -81,6 +81,7 @@
#include "vk_command_pool.h"
#include "vk_debug_report.h"
#include "vk_debug_utils.h"
#include "vk_descriptor_set_layout.h"
#include "vk_descriptor_update_template.h"
#include "vk_device.h"
#include "vk_device_memory.h"
@ -3017,16 +3018,13 @@ enum anv_descriptor_set_layout_type {
};
struct anv_descriptor_set_layout {
struct vk_object_base base;
struct vk_descriptor_set_layout vk;
VkDescriptorSetLayoutCreateFlags flags;
/* Type of descriptor set layout */
enum anv_descriptor_set_layout_type type;
/* Descriptor set layouts can be destroyed at almost any time */
uint32_t ref_cnt;
/* Number of bindings in this descriptor set */
uint32_t binding_count;
@ -3072,29 +3070,8 @@ bool anv_descriptor_requires_bindless(const struct anv_physical_device *pdevice,
const struct anv_descriptor_set_layout *set,
const struct anv_descriptor_set_binding_layout *binding);
void anv_descriptor_set_layout_destroy(struct anv_device *device,
struct anv_descriptor_set_layout *layout);
void anv_descriptor_set_layout_print(const struct anv_descriptor_set_layout *layout);
static inline struct anv_descriptor_set_layout *
anv_descriptor_set_layout_ref(struct anv_descriptor_set_layout *layout)
{
assert(layout && layout->ref_cnt >= 1);
p_atomic_inc(&layout->ref_cnt);
return layout;
}
static inline void
anv_descriptor_set_layout_unref(struct anv_device *device,
struct anv_descriptor_set_layout *layout)
{
assert(layout && layout->ref_cnt >= 1);
if (p_atomic_dec_zero(&layout->ref_cnt))
anv_descriptor_set_layout_destroy(device, layout);
}
struct anv_descriptor {
VkDescriptorType type;
@ -6724,7 +6701,7 @@ VK_DEFINE_NONDISP_HANDLE_CASTS(anv_descriptor_pool, base, VkDescriptorPool,
VK_OBJECT_TYPE_DESCRIPTOR_POOL)
VK_DEFINE_NONDISP_HANDLE_CASTS(anv_descriptor_set, base, VkDescriptorSet,
VK_OBJECT_TYPE_DESCRIPTOR_SET)
VK_DEFINE_NONDISP_HANDLE_CASTS(anv_descriptor_set_layout, base,
VK_DEFINE_NONDISP_HANDLE_CASTS(anv_descriptor_set_layout, vk.base,
VkDescriptorSetLayout,
VK_OBJECT_TYPE_DESCRIPTOR_SET_LAYOUT)
VK_DEFINE_NONDISP_HANDLE_CASTS(anv_device_memory, vk.base, VkDeviceMemory,