summaryrefslogtreecommitdiff
path: root/src/mesa/main/attrib.c
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2008-02-02 02:54:13 -0800
committerEric Anholt <eric@anholt.net>2008-02-04 18:24:16 -0800
commit5857e988be9317810cf713478195b4ed849eea4a (patch)
tree68477757d608fe7b4ed250ff4bfb038bb95e5dd7 /src/mesa/main/attrib.c
parent2abcc512a3ce81bc11ff2b45a2208d3400a2385d (diff)
Allow first != 0 in mesa CVA handling, and add more error checking.
Diffstat (limited to 'src/mesa/main/attrib.c')
-rw-r--r--src/mesa/main/attrib.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 07ec285eeb..66e6aadc0f 100644
--- a/src/mesa/main/attrib.c
+++ b/src/mesa/main/attrib.c
@@ -1399,8 +1399,10 @@ _mesa_PopClientAttrib(void)
adjust_buffer_object_ref_counts(&ctx->Array, -1);
ctx->Array.ActiveTexture = data->ActiveTexture;
- ctx->Array.LockFirst = data->LockFirst;
- ctx->Array.LockCount = data->LockCount;
+ if (data->LockCount != 0)
+ _mesa_LockArraysEXT(data->LockFirst, data->LockCount);
+ else
+ _mesa_UnlockArraysEXT();
_mesa_BindVertexArrayAPPLE( data->ArrayObj->Name );