projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e3202a8
)
intel: Fix leakage of active texture state in glBitmap fp metaops.
author
Eric Anholt
<eric@anholt.net>
Tue, 22 Dec 2009 19:18:29 +0000
(11:18 -0800)
committer
Eric 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
patch
|
blob
|
history
diff --git
a/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
b/src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
index 668697cb5eb450a567c854aadfdb134c8beee9c9..d0bcc2a360291d081e3c1a30bbceded055a1657b 100644
(file)
--- 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();