From: Brian Paul <brianp@vmware.com>
Date: Tue, 28 Feb 2012 03:28:09 +0000 (-0700)
Subject: mesa: use arrayObj var in more places in client_state()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9b9c7da966a4f5182461be90dd6615fbe0399e3c;p=mesa.git

mesa: use arrayObj var in more places in client_state()
---

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 );