Mesa (master): meta: Don' t bind the created texture object in init_temp_texture().

Brian Paul brianp at kemper.freedesktop.org
Thu Sep 16 19:01:13 UTC 2010


Module: Mesa
Branch: master
Commit: 50ac56bf98d6fd16fd1b7534268ee362e45b691d
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=50ac56bf98d6fd16fd1b7534268ee362e45b691d

Author: Francisco Jerez <currojerez at riseup.net>
Date:   Thu Sep 16 10:52:30 2010 -0700

meta: Don't bind the created texture object in init_temp_texture().

This function is executed outside _mesa_meta_begin/end(), that means
that e.g. _mesa_meta_Bitmap() clobbers the texturing state because it
changes the currently active texture object.

There's no need to bind the new texture when it's created, it's done
again later anyway (from setup_drawpix/copypix_texture()).

Signed-off-by: Brian Paul <brianp at vmware.com>

---

 src/mesa/drivers/common/meta.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index a03cb68..87d116a 100644
--- a/src/mesa/drivers/common/meta.c
+++ b/src/mesa/drivers/common/meta.c
@@ -855,7 +855,6 @@ init_temp_texture(GLcontext *ctx, struct temp_texture *tex)
    assert(tex->MaxSize > 0);
 
    _mesa_GenTextures(1, &tex->TexObj);
-   _mesa_BindTexture(tex->Target, tex->TexObj);
 }
 
 




More information about the mesa-commit mailing list