From 758e932ad27921c77ec1b163d45f3d07d8d336e1 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Thu, 16 Jul 2020 08:52:24 -0400 Subject: zink: use same function for all pipe_context::delete_*_state shader methods we don't currently do anything special with any of these, so it'd be better to not have the same code copy/pasted around Reviewed-by: Erik Faye-Lund Part-of: --- src/gallium/drivers/zink/zink_program.c | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) (limited to 'src/gallium/drivers/zink') diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c index e9d060cf3d3..31db137666f 100644 --- a/src/gallium/drivers/zink/zink_program.c +++ b/src/gallium/drivers/zink/zink_program.c @@ -422,13 +422,6 @@ zink_bind_vs_state(struct pipe_context *pctx, bind_stage(zink_context(pctx), PIPE_SHADER_VERTEX, cso); } -static void -zink_delete_vs_state(struct pipe_context *pctx, - void *cso) -{ - zink_shader_free(zink_context(pctx), cso); -} - static void * zink_create_fs_state(struct pipe_context *pctx, const struct pipe_shader_state *shader) @@ -449,13 +442,6 @@ zink_bind_fs_state(struct pipe_context *pctx, bind_stage(zink_context(pctx), PIPE_SHADER_FRAGMENT, cso); } -static void -zink_delete_fs_state(struct pipe_context *pctx, - void *cso) -{ - zink_shader_free(zink_context(pctx), cso); -} - static void * zink_create_gs_state(struct pipe_context *pctx, const struct pipe_shader_state *shader) @@ -477,8 +463,7 @@ zink_bind_gs_state(struct pipe_context *pctx, } static void -zink_delete_gs_state(struct pipe_context *pctx, - void *cso) +zink_delete_shader_state(struct pipe_context *pctx, void *cso) { zink_shader_free(zink_context(pctx), cso); } @@ -489,13 +474,13 @@ zink_program_init(struct zink_context *ctx) { ctx->base.create_vs_state = zink_create_vs_state; ctx->base.bind_vs_state = zink_bind_vs_state; - ctx->base.delete_vs_state = zink_delete_vs_state; + ctx->base.delete_vs_state = zink_delete_shader_state; ctx->base.create_fs_state = zink_create_fs_state; ctx->base.bind_fs_state = zink_bind_fs_state; - ctx->base.delete_fs_state = zink_delete_fs_state; + ctx->base.delete_fs_state = zink_delete_shader_state; ctx->base.create_gs_state = zink_create_gs_state; ctx->base.bind_gs_state = zink_bind_gs_state; - ctx->base.delete_gs_state = zink_delete_gs_state; + ctx->base.delete_gs_state = zink_delete_shader_state; } -- cgit v1.2.3