OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

anv/descriptor_set: Unlink sets from the pool in set_destroy

Browse Source 
anv_descriptor_pool_free_set is called on the clean-up path of
anv_descriptor_set_create and the set may not have been added to the
pool's list of sets yet.  While we're here, we move adding it to that
list into set_create for symmetry.

Fixes: 105002bd2d "anv: destroy descriptor sets when pool gets..."
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
This commit is contained in:
Jason Ekstrand
2019-04-23 22:13:55 -05:00
parent 4add3c6880
commit 6be603edf7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/intel/vulkan/anv_descriptor_set.c
View File

@@ -840,8 +840,6 @@ anv_descriptor_pool_free_set(struct anv_descriptor_pool *pool,
entry->size = set->size; entry->size = set->size;
pool->free_list = (char *) entry - pool->data; pool->free_list = (char *) entry - pool->data;
} }
list_del(&set->pool_link);
} }
struct surface_state_free_list_entry { struct surface_state_free_list_entry {
@@ -971,6 +969,8 @@ anv_descriptor_set_create(struct anv_device *device,
anv_descriptor_pool_alloc_state(pool); anv_descriptor_pool_alloc_state(pool);
} }
list_addtail(&set->pool_link, &pool->desc_sets);
*out_set = set; *out_set = set;
return VK_SUCCESS; return VK_SUCCESS;
@@ -993,6 +993,8 @@ anv_descriptor_set_destroy(struct anv_device *device,
for (uint32_t b = 0; b < set->buffer_view_count; b++) for (uint32_t b = 0; b < set->buffer_view_count; b++)
anv_descriptor_pool_free_state(pool, set->buffer_views[b].surface_state); anv_descriptor_pool_free_state(pool, set->buffer_views[b].surface_state);
list_del(&set->pool_link);
anv_descriptor_pool_free_set(pool, set); anv_descriptor_pool_free_set(pool, set);
} }
@@ -1016,8 +1018,6 @@ VkResult anv_AllocateDescriptorSets(
if (result != VK_SUCCESS) if (result != VK_SUCCESS)
break; break;
list_addtail(&set->pool_link, &pool->desc_sets);
pDescriptorSets[i] = anv_descriptor_set_to_handle(set); pDescriptorSets[i] = anv_descriptor_set_to_handle(set);
} }