diff options
| author | Brian Paul <brianp@vmware.com> | 2009-05-22 14:09:35 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-05-22 14:09:35 -0600 |
| commit | fac334e6d33b0c9ffa2c5147079d728b647d0d2a (patch) | |
| tree | 9a686f63025cc6a5bdfce76e7e5b18ef9cc287a0 | |
| parent | 4b55e3695279daef221669ff063631cf3675da0c (diff) | |
| parent | 1045481dd96dec6e37f4b623b1dbae8af381de75 (diff) | |
Merge branch 'mesa_7_5_branch'
| -rw-r--r-- | src/mesa/main/state.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c index bfbefa55d44..d5bdb63a97b 100644 --- a/src/mesa/main/state.c +++ b/src/mesa/main/state.c @@ -194,9 +194,9 @@ update_arrays( GLcontext *ctx ) /* 16..31 */ if (ctx->VertexProgram._Current) { - for (i = VERT_ATTRIB_GENERIC0; i < VERT_ATTRIB_MAX; i++) { + for (i = 0; i < Elements(arrayObj->VertexAttrib); i++) { if (arrayObj->VertexAttrib[i].Enabled) { - min = update_min(min, &arrayObj->VertexAttrib[i]); + min = MIN2(min, arrayObj->VertexAttrib[i]._MaxElement); } } } |