From: Eric Anholt <eric@anholt.net>
Date: Tue, 22 Dec 2009 19:18:29 +0000 (-0800)
Subject: intel: Fix leakage of active texture state in glBitmap fp metaops.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d85a6f70eba7d59bdee34d33e8b3caaeac328ecb;p=mesa.git

intel: Fix leakage of active texture state in glBitmap fp metaops.

Noticed by clang.
---

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();