Module: Mesa
Branch: master
Commit: e455c8283b2e46f81cf43ae65d23b1de27ee3f67
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=e455c8283b2e46f81cf43ae65d23b1de27ee3f67
Author: Eric Anholt <e...@anholt.net>
Date: Tue Feb 11 16:19:29 2014 -0800
meta: Drop a now-trivial helper function.
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
Reviewed-by: Ian Romanick <ian.d.roman...@intel.com>
---
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 f0cd5a0..268f418 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);
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
