KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zink: make batch usage unsetting function public 

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9753>
This commit is contained in:
Mike Blumenkrantz 2021-03-21 10:44:55 -04:00 committed by Marge Bot
parent a315e8ce3e
commit d54688f1e8
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/zink/zink_batch.c
View File

@ -16,20 +16,14 @@
#include "wsi_common.h"
static void
batch_usage_unset(struct zink_batch_usage *u, enum zink_queue queue, uint32_t batch_id)
{
p_atomic_cmpxchg(&u->usage[queue], batch_id, 0);
}
void
zink_batch_state_clear_resources(struct zink_screen *screen, struct zink_batch_state *bs)
{
/* unref all used resources */
set_foreach(bs->resources, entry) {
struct zink_resource_object *obj = (struct zink_resource_object *)entry->key;
batch_usage_unset(&obj->reads, !!bs->fence.is_compute, bs->fence.batch_id);
batch_usage_unset(&obj->writes, !!bs->fence.is_compute, bs->fence.batch_id);
zink_batch_usage_unset(&obj->reads, !!bs->fence.is_compute, bs->fence.batch_id);
zink_batch_usage_unset(&obj->writes, !!bs->fence.is_compute, bs->fence.batch_id);
zink_resource_object_reference(screen, &obj, NULL);
_mesa_set_remove(bs->resources, entry);
}
@ -50,13 +44,13 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
set_foreach(bs->surfaces, entry) {
struct zink_surface *surf = (struct zink_surface *)entry->key;
batch_usage_unset(&surf->batch_uses, !!bs->fence.is_compute, bs->fence.batch_id);
zink_batch_usage_unset(&surf->batch_uses, !!bs->fence.is_compute, bs->fence.batch_id);
zink_surface_reference(screen, &surf, NULL);
_mesa_set_remove(bs->surfaces, entry);
}
set_foreach(bs->bufferviews, entry) {
struct zink_buffer_view *buffer_view = (struct zink_buffer_view *)entry->key;
batch_usage_unset(&buffer_view->batch_uses, !!bs->fence.is_compute, bs->fence.batch_id);
zink_batch_usage_unset(&buffer_view->batch_uses, !!bs->fence.is_compute, bs->fence.batch_id);
zink_buffer_view_reference(screen, &buffer_view, NULL);
_mesa_set_remove(bs->bufferviews, entry);
}
@ -69,7 +63,7 @@ zink_reset_batch_state(struct zink_context *ctx, struct zink_batch_state *bs)
set_foreach(bs->desc_sets, entry) {
struct zink_descriptor_set *zds = (void*)entry->key;
batch_usage_unset(&zds->batch_uses, !!bs->fence.is_compute, bs->fence.batch_id);
zink_batch_usage_unset(&zds->batch_uses, !!bs->fence.is_compute, bs->fence.batch_id);
/* reset descriptor pools when no bs is using this program to avoid
* having some inactive program hogging a billion descriptors
*/

6
src/gallium/drivers/zink/zink_batch.h
View File

@ -151,4 +151,10 @@ bool
zink_batch_usage_matches(struct zink_batch_usage *u, enum zink_queue queue, uint32_t batch_id);
bool
zink_batch_usage_exists(struct zink_batch_usage *u);
static inline void
zink_batch_usage_unset(struct zink_batch_usage *u, enum zink_queue queue, uint32_t batch_id)
{
p_atomic_cmpxchg(&u->usage[queue], batch_id, 0);
}
#endif