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

zink: use screen param for zink_shader_free()

Browse Source 
the context is no longer used

Reviewed-by: Adam Jackson <ajax@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18689>
This commit is contained in:
Mike Blumenkrantz
2022-09-20 14:28:07 -04:00
committed by Marge Bot
parent ac1b343477
commit 10ed67867e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/zink/zink_compiler.c
+3 -3
View File
@@ -3236,7 +3236,7 @@ zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr)
}
void
zink_shader_free(struct zink_context *ctx, struct zink_shader *shader)
zink_shader_free(struct zink_screen *screen, struct zink_shader *shader)
{
assert(shader->nir->info.stage != MESA_SHADER_COMPUTE);
set_foreach(shader->programs, entry) {
@@ -3264,11 +3264,11 @@ zink_shader_free(struct zink_context *ctx, struct zink_shader *shader)
/* only remove generated tcs during parent tes destruction */
if (stage == MESA_SHADER_TESS_EVAL && shader->generated)
prog->shaders[MESA_SHADER_TESS_CTRL] = NULL;
zink_gfx_program_reference(zink_screen(ctx->base.screen), &prog, NULL);
zink_gfx_program_reference(screen, &prog, NULL);
}
if (shader->nir->info.stage == MESA_SHADER_TESS_EVAL && shader->generated) {
/* automatically destroy generated tcs shaders when tes is destroyed */
zink_shader_free(ctx, shader->generated);
zink_shader_free(screen, shader->generated);
shader->generated = NULL;
}
_mesa_set_destroy(shader->programs, NULL);
src/gallium/drivers/zink/zink_compiler.h
+1 -1
View File
@@ -66,7 +66,7 @@ char *
zink_shader_finalize(struct pipe_screen *pscreen, void *nirptr);
void
zink_shader_free(struct zink_context *ctx, struct zink_shader *shader);
zink_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);
src/gallium/drivers/zink/zink_program.c
+1 -1
View File
@@ -1269,7 +1269,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_context(pctx), cso);
zink_shader_free(zink_screen(pctx->screen), cso);
}
void *