From 9f6eec03e0023fa0f849bdb35eea58594293edac Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 29 Mar 2023 08:50:43 -0400 Subject: [PATCH] zink: zink_shader_free -> zink_gfx_shader_free Part-of: --- src/gallium/drivers/zink/zink_compiler.c | 6 +++--- src/gallium/drivers/zink/zink_compiler.h | 2 +- src/gallium/drivers/zink/zink_program.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c index 769b540..8fde6d8 100644 --- a/src/gallium/drivers/zink/zink_compiler.c +++ b/src/gallium/drivers/zink/zink_compiler.c @@ -4968,7 +4968,7 @@ zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr) } void -zink_shader_free(struct zink_screen *screen, struct zink_shader *shader) +zink_gfx_shader_free(struct zink_screen *screen, struct zink_shader *shader) { assert(shader->info.stage != MESA_SHADER_COMPUTE); set_foreach(shader->programs, entry) { @@ -5034,7 +5034,7 @@ zink_shader_free(struct zink_screen *screen, struct zink_shader *shader) if (shader->info.stage == MESA_SHADER_TESS_EVAL && shader->non_fs.generated_tcs) { /* automatically destroy generated tcs shaders when tes is destroyed */ - zink_shader_free(screen, shader->non_fs.generated_tcs); + zink_gfx_shader_free(screen, shader->non_fs.generated_tcs); shader->non_fs.generated_tcs = NULL; } for (unsigned int i = 0; i < ARRAY_SIZE(shader->non_fs.generated_gs); i++) { @@ -5042,7 +5042,7 @@ zink_shader_free(struct zink_screen *screen, struct zink_shader *shader) if (shader->info.stage != MESA_SHADER_FRAGMENT && shader->non_fs.generated_gs[i][j]) { /* automatically destroy generated gs shaders when owner is destroyed */ - zink_shader_free(screen, shader->non_fs.generated_gs[i][j]); + zink_gfx_shader_free(screen, shader->non_fs.generated_gs[i][j]); shader->non_fs.generated_gs[i][j] = NULL; } } diff --git a/src/gallium/drivers/zink/zink_compiler.h b/src/gallium/drivers/zink/zink_compiler.h index 343ee9b..dab0d8f 100644 --- a/src/gallium/drivers/zink/zink_compiler.h +++ b/src/gallium/drivers/zink/zink_compiler.h @@ -80,7 +80,7 @@ char * zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr); void -zink_shader_free(struct zink_screen *screen, struct zink_shader *shader); +zink_gfx_shader_free(struct zink_screen *screen, struct zink_shader *shader); VkShaderModule zink_shader_tcs_compile(struct zink_screen *screen, struct zink_shader *zs, unsigned patch_vertices); diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index b11758d..c9c5bbd 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -1161,7 +1161,7 @@ create_gfx_program_separable(struct zink_context *ctx, struct zink_shader **stag } } /* We can do this add after the _mesa_set_adds above because we know the prog->shaders[] are - * referenced by the draw state and zink_shader_free() can't be called on them while we're in here. + * referenced by the draw state and zink_gfx_shader_free() can't be called on them while we're in here. */ p_atomic_add(&prog->base.reference.count, refs); @@ -1890,7 +1890,7 @@ zink_delete_cs_shader_state(struct pipe_context *pctx, void *cso) void zink_delete_shader_state(struct pipe_context *pctx, void *cso) { - zink_shader_free(zink_screen(pctx->screen), cso); + zink_gfx_shader_free(zink_screen(pctx->screen), cso); } void * -- 2.7.4