summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2011-05-18 08:14:32 -0600
committerBrian Paul <brianp@vmware.com>2011-05-18 08:14:32 -0600
commit496bf04905197dc46c2dffe281008bd7f5edf8a8 (patch)
tree04adba048a0f13fa44e958f4eadd4443c47ca2f3
parentde1df26b5c11a45f2b1ff2ddc7b8ec764356aa94 (diff)
mesa: only update array _MaxElement if array is enabled
Fixes failed assertion when calling _mesa_print_arrays() debug function.
-rw-r--r--src/mesa/main/arrayobj.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 4bfb242400..83a82e8686 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -289,9 +289,10 @@ remove_array_object( struct gl_context *ctx, struct gl_array_object *obj )
static GLuint
update_min(GLuint min, struct gl_client_array *array)
{
- _mesa_update_array_max_element(array);
- if (array->Enabled)
+ if (array->Enabled) {
+ _mesa_update_array_max_element(array);
return MIN2(min, array->_MaxElement);
+ }
else
return min;
}