summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2012-02-27 20:28:09 -0700
committerBrian Paul <[email protected]>2012-02-29 08:39:20 -0700
commit9b9c7da966a4f5182461be90dd6615fbe0399e3c (patch)
tree893d502664f9574ac316249646d8144f1694ce44 /src/mesa/main
parent6eba268ec65523fe8b2ec7dee670b2b5d4ebe1d9 (diff)
mesa: use arrayObj var in more places in client_state()
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/enable.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 270b24045ba..515dda95243 100644
--- a/src/mesa/main/enable.c
+++ b/src/mesa/main/enable.c
@@ -118,7 +118,7 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
CHECK_EXTENSION(NV_vertex_program, cap);
{
GLint n = (GLint) cap - GL_VERTEX_ATTRIB_ARRAY0_NV;
- ASSERT(VERT_ATTRIB_GENERIC(n) < Elements(ctx->Array.ArrayObj->VertexAttrib));
+ ASSERT(VERT_ATTRIB_GENERIC(n) < Elements(arrayObj->VertexAttrib));
var = &arrayObj->VertexAttrib[VERT_ATTRIB_GENERIC(n)].Enabled;
flag = VERT_BIT_GENERIC(n);
}
@@ -149,9 +149,9 @@ client_state(struct gl_context *ctx, GLenum cap, GLboolean state)
*var = state;
if (state)
- ctx->Array.ArrayObj->_Enabled |= flag;
+ arrayObj->_Enabled |= flag;
else
- ctx->Array.ArrayObj->_Enabled &= ~flag;
+ arrayObj->_Enabled &= ~flag;
if (ctx->Driver.Enable) {
ctx->Driver.Enable( ctx, cap, state );