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

zink: use set_foreach_remove()

Browse source 
this saves potentially thousands of iterations on each batch reset

Reviewed-by: Dave Airlie <airlied@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10097>
This commit is contained in:
Mike Blumenkrantz 2021-01-12 14:51:44 -05:00 • committed by Marge Bot
parent c7e4f28a16
commit 6536d5a947
2 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/zink/zink_batch.c
View file

@ -32,23 +32,20 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
zink_fence_clear_resources(screen, &bs->fence);
set_foreach(bs->active_queries, entry) {
set_foreach_remove(bs->active_queries, entry) {
struct zink_query *query = (void*)entry->key;
zink_prune_query(screen, query);
_mesa_set_remove(bs->active_queries, entry);
}
set_foreach(bs->surfaces, entry) {
set_foreach_remove(bs->surfaces, entry) {
struct zink_surface *surf = (struct zink_surface *)entry->key;
zink_batch_usage_unset(&surf->batch_uses, bs->fence.batch_id);
zink_surface_reference(screen, &surf, NULL);
_mesa_set_remove(bs->surfaces, entry);
}
set_foreach(bs->bufferviews, entry) {
set_foreach_remove(bs->bufferviews, entry) {
struct zink_buffer_view *buffer_view = (struct zink_buffer_view *)entry->key;
zink_batch_usage_unset(&buffer_view->batch_uses, bs->fence.batch_id);
zink_buffer_view_reference(screen, &buffer_view, NULL);
_mesa_set_remove(bs->bufferviews, entry);
}
util_dynarray_foreach(&bs->zombie_samplers, VkSampler, samp) {
@ -68,7 +65,7 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
_mesa_set_remove(bs->desc_sets, entry);
}
set_foreach(bs->programs, entry) {
set_foreach_remove(bs->programs, entry) {
struct zink_program *pg = (struct zink_program*)entry->key;
if (pg->is_compute) {
struct zink_compute_program *comp = (struct zink_compute_program*)pg;
@ -81,7 +78,6 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
if (zink_gfx_program_reference(screen, &prog, NULL) && in_use)
ctx->curr_program = NULL;
}
_mesa_set_remove(bs->programs, entry);
}
set_foreach(bs->fbs, entry) {

3
src/gallium/drivers/zink/zink_fence.c
View file

@ -37,12 +37,11 @@ zink_fence_clear_resources(struct zink_screen *screen, struct zink_fence *fence)
{
simple_mtx_lock(&fence->resource_mtx);
/* unref all used resources */
set_foreach(fence->resources, entry) {
set_foreach_remove(fence->resources, entry) {
struct zink_resource_object *obj = (struct zink_resource_object *)entry->key;
zink_batch_usage_unset(&obj->reads, fence->batch_id);
zink_batch_usage_unset(&obj->writes, fence->batch_id);
zink_resource_object_reference(screen, &obj, NULL);
_mesa_set_remove(fence->resources, entry);
}
simple_mtx_unlock(&fence->resource_mtx);
}