summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2014-02-11 16:19:29 -0800
committerEric Anholt <[email protected]>2014-02-12 15:38:57 -0800
commite455c8283b2e46f81cf43ae65d23b1de27ee3f67 (patch)
treebf5aa0cb0b0dd5750c888a2ee02db1eef0703b10
parente48a6378c905ab7817fcd19e08c186a89a39e005 (diff)
meta: Drop a now-trivial helper function.
Reviewed-by: Kenneth Graunke <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/mesa/drivers/common/meta.c15
1 files 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
@@ -3421,17 +3421,6 @@ sampler_table_cleanup(struct sampler_table *table)
}
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)
{
if (mipmap->VAO == 0)
@@ -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);