summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2009-12-22 11:18:29 -0800
committerEric Anholt <eric@anholt.net>2009-12-22 14:20:26 -0800
commitd85a6f70eba7d59bdee34d33e8b3caaeac328ecb (patch)
treeb4f8b92a21f95b8a03b477ccf20d4d2e9ef54764 /src
parente3202a8cc7178373e8e5af60c090550aef29392c (diff)
intel: Fix leakage of active texture state in glBitmap fp metaops.
Noticed by clang.
Diffstat (limited to 'src')
-rw-r--r--src/mesa/drivers/dri/intel/intel_pixel_bitmap.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index 668697cb5eb..d0bcc2a3602 100644
--- a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
+++ b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
@@ -503,6 +503,7 @@ intel_texture_bitmap(GLcontext * ctx,
meta_restore_fragment_program(&intel->meta);
meta_restore_vertex_program(&intel->meta);
+ _mesa_ActiveTextureARB(GL_TEXTURE0_ARB + old_active_texture);
_mesa_PopClientAttrib();
_mesa_PopAttrib();