intel: Fix leakage of active texture state in glBitmap fp metaops.
authorEric Anholt <eric@anholt.net>
Tue, 22 Dec 2009 19:18:29 +0000 (11:18 -0800)
committerEric Anholt <eric@anholt.net>
Tue, 22 Dec 2009 22:20:26 +0000 (14:20 -0800)
Noticed by clang.

src/mesa/drivers/dri/intel/intel_pixel_bitmap.c

index 668697c..d0bcc2a 100644 (file)
@@ -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();