From: Brian Paul <brianp@vmware.com>
Date: Fri, 2 Oct 2009 15:55:07 +0000 (-0600)
Subject: mesa: fix incorrect default texture binding in unbind_texobj_from_texunits()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=e1bddd159f364fa04ddec22f568fbfeb775d3b47;p=mesa.git

mesa: fix incorrect default texture binding in unbind_texobj_from_texunits()

If we deleted a currently bound texture, we were always reverting the texture
binding to the default 1D texture rather than the proper default texture.
---

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index d09c4392506..da55ac8697d 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -863,7 +863,7 @@ unbind_texobj_from_texunits(GLcontext *ctx, struct gl_texture_object *texObj)
       for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
          if (texObj == unit->CurrentTex[tex]) {
             _mesa_reference_texobj(&unit->CurrentTex[tex],
-                                   ctx->Shared->DefaultTex[TEXTURE_1D_INDEX]);
+                                   ctx->Shared->DefaultTex[tex]);
             ASSERT(unit->CurrentTex[tex]);
             break;
          }