From 2c8652f98a0b6bba4abfc30069bc0c12a54b9e59 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Fri, 1 Nov 2019 21:49:51 -0400 Subject: [PATCH] st/mesa: rename delete_basic_variant -> delete_common_variant Acked-by: Pierre-Eric Pelloux-Prayer --- src/mesa/state_tracker/st_program.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_program.c b/src/mesa/state_tracker/st_program.c index 2ad19dc8dae..f6a35475286 100644 --- a/src/mesa/state_tracker/st_program.c +++ b/src/mesa/state_tracker/st_program.c @@ -319,8 +319,8 @@ st_release_fp_variants(struct st_context *st, struct st_common_program *stfp) * the variant from the linked list. */ static void -delete_basic_variant(struct st_context *st, struct st_common_variant *v, - GLenum target) +delete_common_variant(struct st_context *st, struct st_common_variant *v, + GLenum target) { if (v->driver_shader) { if (st->has_shareable_shaders || v->key.st == st) { @@ -379,7 +379,7 @@ st_release_common_variants(struct st_context *st, struct st_common_program *p) for (v = p->variants; v; ) { struct st_common_variant *next = v->next; - delete_basic_variant(st, v, p->Base.Target); + delete_common_variant(st, v, p->Base.Target); v = next; } @@ -1914,7 +1914,7 @@ destroy_program_variants(struct st_context *st, struct gl_program *target) /* unlink from list */ *prevPtr = next; /* destroy this variant */ - delete_basic_variant(st, v, target->Target); + delete_common_variant(st, v, target->Target); } else { prevPtr = &v->next; -- 2.30.2