diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-02 16:32:26 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-02 16:32:26 -0700 |
| commit | 0815ebccfc0a12d8f3e831928f1c4210b7f75ad8 (patch) | |
| tree | 1e7db7e1d44e741215e5b4b11d33df91fe5b39a0 /src/mesa/main/bufferobj.c | |
| parent | eb9bbc5265562cb6f93688fc027ea76f91601e37 (diff) | |
| parent | 1fad6ccb756ae33ca3115f59c99ca8abbeb0321e (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/main/ffvertex_prog.c
src/mesa/main/texenvprogram.c
Diffstat (limited to 'src/mesa/main/bufferobj.c')
| -rw-r--r-- | src/mesa/main/bufferobj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 190e6ab564..016543da01 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -808,7 +808,7 @@ _mesa_DeleteBuffersARB(GLsizei n, const GLuint *ids) unbind(ctx, &ctx->Array.ArrayObj->FogCoord.BufferObj, bufObj); unbind(ctx, &ctx->Array.ArrayObj->Index.BufferObj, bufObj); unbind(ctx, &ctx->Array.ArrayObj->EdgeFlag.BufferObj, bufObj); - for (j = 0; j < MAX_TEXTURE_UNITS; j++) { + for (j = 0; j < MAX_TEXTURE_COORD_UNITS; j++) { unbind(ctx, &ctx->Array.ArrayObj->TexCoord[j].BufferObj, bufObj); } for (j = 0; j < VERT_ATTRIB_MAX; j++) { |