From: Henri Verbeet <hverbeet@gmail.com>
Date: Sun, 3 Jul 2011 22:57:42 +0000 (+0200)
Subject: mesa: Check the texture against all units in unbind_texobj_from_texunits().
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=2e35d90fb9a50562d3c658d45a50e16623028d8e;p=mesa.git

mesa: Check the texture against all units in unbind_texobj_from_texunits().

NOTE: This is a candidate for the 7.11 branch.

Signed-off-by: Henri Verbeet <hverbeet@gmail.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
---

diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index 565a3a2d8df..0e84b874411 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -899,7 +899,7 @@ unbind_texobj_from_texunits(struct gl_context *ctx,
 {
    GLuint u, tex;
 
-   for (u = 0; u < MAX_TEXTURE_IMAGE_UNITS; u++) {
+   for (u = 0; u < Elements(ctx->Texture.Unit); u++) {
       struct gl_texture_unit *unit = &ctx->Texture.Unit[u];
       for (tex = 0; tex < NUM_TEXTURE_TARGETS; tex++) {
          if (texObj == unit->CurrentTex[tex]) {