Module: Mesa Branch: master Commit: d85a6f70eba7d59bdee34d33e8b3caaeac328ecb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d85a6f70eba7d59bdee34d33e8b3caaeac328ecb
Author: Eric Anholt <[email protected]> Date: Tue Dec 22 11:18:29 2009 -0800 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 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 668697c..d0bcc2a 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(); _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
