summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHenri Verbeet <hverbeet@gmail.com>2011-07-04 00:57:42 +0200
committerMarek Olšák <maraeo@gmail.com>2011-10-02 16:45:46 +0200
commit36dab12726412060b80743f2cab38dc622d766a6 (patch)
treea0eb68274c20547bbcbbd1bf427ea861ac4d720d
parentdc253d31003d6de9c7acc795ec405ac4c9acadff (diff)
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> (cherry picked from commit 2e35d90fb9a50562d3c658d45a50e16623028d8e)
-rw-r--r--src/mesa/main/texobj.c2
1 files changed, 1 insertions, 1 deletions
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]) {