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

nvk/descriptor_table: Add a couple new helpers

Browse source 
This cleans up the code a bit, de-duplicates, and makes locking easier
to understand.

Reviewed-by: Mel Henning <mhenning@darkrefraction.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35327>
This commit is contained in:
Faith Ekstrand 2025-06-03 15:49:14 -04:00 • committed by Marge Bot
parent 9e52e296f7
commit ec148e9cdc
1 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/nouveau/vulkan/nvk_descriptor_table.c
View file

@ -109,7 +109,35 @@ nvk_descriptor_table_finish(struct nvk_device *dev,
simple_mtx_destroy(&table->mutex);
}
#define NVK_IMAGE_DESC_INVALID
static void *
nvk_descriptor_table_map_locked(struct nvk_descriptor_table *table,
uint32_t index)
{
assert(index < table->alloc);
assert(BITSET_TEST(table->in_use, index));
return (char *)table->mem->map + (index * table->desc_size);
}
static void
nvk_descriptor_table_write_locked(struct nvk_descriptor_table *table,
uint32_t index,
const void *desc_data, size_t desc_size)
{
void *map = nvk_descriptor_table_map_locked(table, index);
assert(desc_size == table->desc_size);
memcpy(map, desc_data, table->desc_size);
}
static void
nvk_descriptor_table_clear_locked(struct nvk_descriptor_table *table,
uint32_t index)
{
void *map = nvk_descriptor_table_map_locked(table, index);
memset(map, 0, table->desc_size);
}
static VkResult
nvk_descriptor_table_alloc_locked(struct nvk_device *dev,
@ -179,10 +207,7 @@ nvk_descriptor_table_add_locked(struct nvk_device *dev,
if (result != VK_SUCCESS)
return result;
void *map = (char *)table->mem->map + (*index_out * table->desc_size);
assert(desc_size == table->desc_size);
memcpy(map, desc_data, table->desc_size);
nvk_descriptor_table_write_locked(table, *index_out, desc_data, desc_size);
return VK_SUCCESS;
}
@ -212,10 +237,7 @@ nvk_descriptor_table_insert_locked(struct nvk_device *dev,
if (result != VK_SUCCESS)
return result;
void *map = (char *)table->mem->map + (index * table->desc_size);
assert(desc_size == table->desc_size);
memcpy(map, desc_data, table->desc_size);
nvk_descriptor_table_write_locked(table, index, desc_data, desc_size);
return result;
}
@ -262,18 +284,15 @@ nvk_descriptor_table_compact_free_table(struct nvk_descriptor_table *table)
table->free_count = j;
}
void
nvk_descriptor_table_remove(struct nvk_device *dev,
struct nvk_descriptor_table *table,
uint32_t index)
static void
nvk_descriptor_table_remove_locked(struct nvk_device *dev,
struct nvk_descriptor_table *table,
uint32_t index)
{
simple_mtx_lock(&table->mutex);
void *map = (char *)table->mem->map + (index * table->desc_size);
memset(map, 0, table->desc_size);
assert(BITSET_TEST(table->in_use, index));
nvk_descriptor_table_clear_locked(table, index);
/* There may be duplicate entries in the free table. For most operations,
* this is fine as we always consult nvk_descriptor_table::in_use when
* allocating. However, it does mean that there's nothing preventing our
@ -288,6 +307,14 @@ nvk_descriptor_table_remove(struct nvk_device *dev,
BITSET_CLEAR(table->in_use, index);
table->free_table[table->free_count++] = index;
}
void
nvk_descriptor_table_remove(struct nvk_device *dev,
struct nvk_descriptor_table *table,
uint32_t index)
{
simple_mtx_lock(&table->mutex);
nvk_descriptor_table_remove_locked(dev, table, index);
simple_mtx_unlock(&table->mutex);
}