From e455c8283b2e46f81cf43ae65d23b1de27ee3f67 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 11 Feb 2014 16:19:29 -0800 Subject: [PATCH] meta: Drop a now-trivial helper function. Reviewed-by: Kenneth Graunke Reviewed-by: Ian Romanick --- src/mesa/drivers/common/meta.c | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index f0cd5a0a8eb..268f418a92c 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3420,17 +3420,6 @@ sampler_table_cleanup(struct sampler_table *table) table->sampler_cubemap_array.shader_prog = 0; } -static void -setup_glsl_generate_mipmap(struct gl_context *ctx, - struct gen_mipmap_state *mipmap, - GLenum target) -{ - setup_vertex_objects(&mipmap->VAO, &mipmap->VBO, true, 2, 3, 0); - - setup_blit_shader(ctx, target, &mipmap->samplers); -} - - static void meta_glsl_generate_mipmap_cleanup(struct gen_mipmap_state *mipmap) { @@ -3490,7 +3479,9 @@ _mesa_meta_GenerateMipmap(struct gl_context *ctx, GLenum target, * GenerateMipmap function. */ if (use_glsl_version) { - setup_glsl_generate_mipmap(ctx, mipmap, target); + setup_vertex_objects(&mipmap->VAO, &mipmap->VBO, true, + 2, 3, 0); + setup_blit_shader(ctx, target, &mipmap->samplers); } else { setup_ff_tnl_for_blit(&mipmap->VAO, &mipmap->VBO, 3); -- 2.30.2