Mesa (master): mesa: use arrayObj var in more places in client_state()

Brian Paul brianp at kemper.freedesktop.org
Wed Feb 29 15:40:30 UTC 2012


Module: Mesa
Branch: master
Commit: 9b9c7da966a4f5182461be90dd6615fbe0399e3c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b9c7da966a4f5182461be90dd6615fbe0399e3c

Author: Brian Paul <brianp at vmware.com>
Date:   Mon Feb 27 20:28:09 2012 -0700

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

---

 src/mesa/main/enable.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c
index 270b240..515dda9 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 );




More information about the mesa-commit mailing list