zink: destroy gfx program when a shader is freed
there's no sense in having these objects sitting around when they can
never be used again
requires adding a zink_context* pointer to each program in order to prune
the hash table entry
Reviewed-by: Antonio Caggiano <antonio.caggiano@collabora.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5887>
diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 33e7631..9b084d2 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -309,11 +309,14 @@
}
void
-zink_shader_free(struct zink_screen *screen, struct zink_shader *shader)
+zink_shader_free(struct zink_context *ctx, struct zink_shader *shader)
{
+ struct zink_screen *screen = zink_screen(ctx->base.screen);
vkDestroyShaderModule(screen->dev, shader->shader_module, NULL);
set_foreach(shader->programs, entry) {
- zink_gfx_program_remove_shader((void*)entry->key, shader);
+ struct zink_gfx_program *prog = (void*)entry->key;
+ _mesa_hash_table_remove_key(ctx->program_cache, prog->stages);
+ zink_destroy_gfx_program(screen, prog);
}
_mesa_set_destroy(shader->programs, NULL);
FREE(shader);
diff --git a/src/gallium/drivers/zink/zink_compiler.h b/src/gallium/drivers/zink/zink_compiler.h
index abc1fbc..ed22479 100644
--- a/src/gallium/drivers/zink/zink_compiler.h
+++ b/src/gallium/drivers/zink/zink_compiler.h
@@ -32,6 +32,7 @@
#include <vulkan/vulkan.h>
struct pipe_screen;
+struct zink_context;
struct zink_screen;
struct zink_gfx_program;
@@ -71,6 +72,6 @@
const struct pipe_stream_output_info *so_info);
void
-zink_shader_free(struct zink_screen *screen, struct zink_shader *shader);
+zink_shader_free(struct zink_context *ctx, struct zink_shader *shader);
#endif
diff --git a/src/gallium/drivers/zink/zink_context.c b/src/gallium/drivers/zink/zink_context.c
index be0c5ad..a9cbd92 100644
--- a/src/gallium/drivers/zink/zink_context.c
+++ b/src/gallium/drivers/zink/zink_context.c
@@ -323,7 +323,7 @@
zink_delete_vs_state(struct pipe_context *pctx,
void *cso)
{
- zink_shader_free(zink_screen(pctx->screen), cso);
+ zink_shader_free(zink_context(pctx), cso);
}
static void *
@@ -350,7 +350,7 @@
zink_delete_fs_state(struct pipe_context *pctx,
void *cso)
{
- zink_shader_free(zink_screen(pctx->screen), cso);
+ zink_shader_free(zink_context(pctx), cso);
}
static void
diff --git a/src/gallium/drivers/zink/zink_draw.c b/src/gallium/drivers/zink/zink_draw.c
index 7ffd3e8..a9d6bcb 100644
--- a/src/gallium/drivers/zink/zink_draw.c
+++ b/src/gallium/drivers/zink/zink_draw.c
@@ -164,8 +164,7 @@
ctx->gfx_stages);
if (!entry) {
struct zink_gfx_program *prog;
- prog = zink_create_gfx_program(zink_screen(ctx->base.screen),
- ctx->gfx_stages);
+ prog = zink_create_gfx_program(ctx, ctx->gfx_stages);
entry = _mesa_hash_table_insert(ctx->program_cache, prog->stages, prog);
if (!entry)
return NULL;
diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index b4827fa..0de286d 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -109,9 +109,10 @@
}
struct zink_gfx_program *
-zink_create_gfx_program(struct zink_screen *screen,
+zink_create_gfx_program(struct zink_context *ctx,
struct zink_shader *stages[PIPE_SHADER_TYPES - 1])
{
+ struct zink_screen *screen = zink_screen(ctx->base.screen);
struct zink_gfx_program *prog = CALLOC_STRUCT(zink_gfx_program);
if (!prog)
goto fail;
@@ -152,8 +153,8 @@
return NULL;
}
-void
-zink_gfx_program_remove_shader(struct zink_gfx_program *prog, struct zink_shader *shader)
+static void
+gfx_program_remove_shader(struct zink_gfx_program *prog, struct zink_shader *shader)
{
enum pipe_shader_type p_stage = pipe_shader_type_from_mesa(shader->info.stage);
@@ -174,7 +175,7 @@
for (int i = 0; i < PIPE_SHADER_TYPES - 1; ++i) {
if (prog->stages[i])
- zink_gfx_program_remove_shader(prog, prog->stages[i]);
+ gfx_program_remove_shader(prog, prog->stages[i]);
}
/* unref all used render-passes */
diff --git a/src/gallium/drivers/zink/zink_program.h b/src/gallium/drivers/zink/zink_program.h
index da52f60..91460aa 100644
--- a/src/gallium/drivers/zink/zink_program.h
+++ b/src/gallium/drivers/zink/zink_program.h
@@ -28,6 +28,7 @@
#include "pipe/p_state.h"
+struct zink_context;
struct zink_screen;
struct zink_shader;
struct zink_gfx_pipeline_state;
@@ -45,7 +46,7 @@
};
struct zink_gfx_program *
-zink_create_gfx_program(struct zink_screen *screen,
+zink_create_gfx_program(struct zink_context *ctx,
struct zink_shader *stages[PIPE_SHADER_TYPES - 1]);
void
@@ -58,7 +59,4 @@
struct zink_gfx_pipeline_state *state,
enum pipe_prim_type mode);
-void
-zink_gfx_program_remove_shader(struct zink_gfx_program *prog, struct zink_shader *shader);
-
#endif
