From 6b8339fa5429cf3eaa6ced53833a81535721912c Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Fri, 12 Aug 2022 12:25:15 -0400 Subject: [PATCH] mesa/st: move compute pbo shutdown to compute pbo file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Acked-by: Marek Olšák Part-of: --- src/mesa/state_tracker/st_pbo.c | 6 +----- src/mesa/state_tracker/st_pbo.h | 2 ++ src/mesa/state_tracker/st_pbo_compute.c | 9 +++++++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src/mesa/state_tracker/st_pbo.c b/src/mesa/state_tracker/st_pbo.c index f32578405f9..27ef9916282 100644 --- a/src/mesa/state_tracker/st_pbo.c +++ b/src/mesa/state_tracker/st_pbo.c @@ -739,9 +739,5 @@ st_destroy_pbo_helpers(struct st_context *st) st->pbo.vs = NULL; } - if (st->pbo.shaders) { - hash_table_foreach(st->pbo.shaders, entry) - st->pipe->delete_compute_state(st->pipe, entry->data); - _mesa_hash_table_destroy(st->pbo.shaders, NULL); - } + st_pbo_compute_deinit(st); } diff --git a/src/mesa/state_tracker/st_pbo.h b/src/mesa/state_tracker/st_pbo.h index b1eafc8fd0a..0b5e28fdf0d 100644 --- a/src/mesa/state_tracker/st_pbo.h +++ b/src/mesa/state_tracker/st_pbo.h @@ -129,5 +129,7 @@ st_init_pbo_helpers(struct st_context *st); extern void st_destroy_pbo_helpers(struct st_context *st); +void +st_pbo_compute_deinit(struct st_context *st); #endif /* ST_PBO_H */ diff --git a/src/mesa/state_tracker/st_pbo_compute.c b/src/mesa/state_tracker/st_pbo_compute.c index 3182f2192eb..df0bdab3a9b 100644 --- a/src/mesa/state_tracker/st_pbo_compute.c +++ b/src/mesa/state_tracker/st_pbo_compute.c @@ -1167,3 +1167,12 @@ st_GetTexSubImage_shader(struct gl_context * ctx, return true; } +void +st_pbo_compute_deinit(struct st_context *st) +{ + if (!st->pbo.shaders) + return; + hash_table_foreach(st->pbo.shaders, entry) + st->pipe->delete_compute_state(st->pipe, entry->data); + _mesa_hash_table_destroy(st->pbo.shaders, NULL); +}