diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-22 14:29:51 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-22 14:29:51 +0000 |
| commit | 016747a04df9d4474489fe3b3d1c0f11a713148b (patch) | |
| tree | 69722f37ac06c00d6674c7bf2df6597753b418e6 /mesalib/src/mesa/main/arrayobj.c | |
| parent | 32a666fa1f26defd3b4e508b75f1acf6e2900a40 (diff) | |
| parent | 52011cfedaa930d61d8f60b283a2051093727582 (diff) | |
| download | vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.gz vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.tar.bz2 vcxsrv-016747a04df9d4474489fe3b3d1c0f11a713148b.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/arrayobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/arrayobj.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c index ce1e277bd..8d53186c8 100644 --- a/mesalib/src/mesa/main/arrayobj.c +++ b/mesalib/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;
}
|