diff options
| author | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-03-05 10:23:14 +0100 |
| commit | 8db4c7567d495ef6f6162406394ac192e6c2cfe7 (patch) | |
| tree | 9d8233b2f54ad198da3354aa9dbd8d0082156a9c /mesalib/src/mesa/main/enable.c | |
| parent | c14f2432d6bfb3de6c6289efd0471f038a289327 (diff) | |
| parent | 50ace52bb8308fd62b8bad9ae912dc18c4ae32ff (diff) | |
| download | vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.gz vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.tar.bz2 vcxsrv-8db4c7567d495ef6f6162406394ac192e6c2cfe7.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/enable.c')
| -rw-r--r-- | mesalib/src/mesa/main/enable.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/main/enable.c b/mesalib/src/mesa/main/enable.c index 270b24045..515dda952 100644 --- a/mesalib/src/mesa/main/enable.c +++ b/mesalib/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 ); |