From 9e414865a6716f688c7bce904d841f9ba16cd967 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 20 Sep 2011 11:48:57 -0600 Subject: meta: use _mesa_set_enable(), fix decompress_texture_image() Use _mesa_set_enable() to avoid a redudant context lookup. Need to disable the texture target in decompress_texture_image() so the unit isn't still enabled after glGetTexImage() returns. Arguably, the meta restore code should do this, but it doesn't. Reviewed-by: Eric Anholt --- src/mesa/drivers/common/meta.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/mesa/drivers/common') diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 82b072eeb8c..be1953ab2f9 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -3182,7 +3182,7 @@ decompress_texture_image(struct gl_context *ctx, /* setup texture state */ _mesa_BindTexture(target, texObj->Name); - _mesa_Enable(target); + _mesa_set_enable(ctx, target, GL_TRUE); { /* save texture object state */ @@ -3233,6 +3233,9 @@ decompress_texture_image(struct gl_context *ctx, ctx->Pack.RowLength = destRowLength; _mesa_ReadPixels(0, 0, width, height, destFormat, destType, dest); + /* disable texture unit */ + _mesa_set_enable(ctx, target, GL_FALSE); + _mesa_meta_end(ctx); /* restore fbo bindings */ -- cgit v1.2.3