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 <eric@anholt.net>
This commit is contained in:
@@ -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 */
|
||||
|
||||
Reference in New Issue
Block a user