From: Francisco Jerez <currojerez@riseup.net>
Date: Thu, 16 Sep 2010 17:52:30 +0000 (-0700)
Subject: meta: Don't bind the created texture object in init_temp_texture().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=50ac56bf98d6fd16fd1b7534268ee362e45b691d;p=mesa.git

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@vmware.com>
---

diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c
index a03cb68ec8a..87d116ad9f1 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);
 }