From d85a6f70eba7d59bdee34d33e8b3caaeac328ecb Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 22 Dec 2009 11:18:29 -0800 Subject: intel: Fix leakage of active texture state in glBitmap fp metaops. Noticed by clang. --- src/mesa/drivers/dri/intel/intel_pixel_bitmap.c | 1 + 1 file changed, 1 insertion(+) (limited to 'src/mesa/drivers/dri') diff --git a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c index 668697cb5e..d0bcc2a360 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(); -- cgit v1.2.3