commit 758e932ad27921c77ec1b163d45f3d07d8d336e1
author Mike Blumenkrantz <michael.blumenkrantz@gmail.com> Thu Jul 16 08:52:24 2020 -0400
committer Marge Bot <eric+marge@anholt.net> Sun Nov 08 13:57:38 2020 +0000
tree 68087bb1937539ad9a8d0913c0a8d2f44496d7a0
parent d377d844969b18264d3eeeeb1bbdf37131c69791

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 <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7485>

src/gallium/drivers/zink/zink_program.c

diff --git a/src/gallium/drivers/zink/zink_program.c b/src/gallium/drivers/zink/zink_program.c
index e9d060c..31db137 100644
--- a/src/gallium/drivers/zink/zink_program.c
+++ b/src/gallium/drivers/zink/zink_program.c
@@ -422,13 +422,6 @@
    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 @@
    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 @@
 }
 
 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 @@
 {
    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;
 }