diff options
author | marha <marha@users.sourceforge.net> | 2012-10-17 08:04:15 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2012-10-17 08:04:15 +0200 |
commit | ded57b5a4131a213d57f5a20d50b819b7a8924df (patch) | |
tree | 5be4cc93cf5d77df72f8ae6e34953e026bde071f /mesalib/src/mesa/main/arrayobj.c | |
parent | 54db46582aba2252d544fa3956522f9ef06b49cb (diff) | |
download | vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.tar.gz vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.tar.bz2 vcxsrv-ded57b5a4131a213d57f5a20d50b819b7a8924df.zip |
pixman mesa git update 17 oct 2012
pixman: 6e56098c0338ce74228187e4c96fed1a66cb0956
mesa: 0199ff7fe323cf527ffacfdef3258ab85799dd13
Diffstat (limited to 'mesalib/src/mesa/main/arrayobj.c')
-rw-r--r-- | mesalib/src/mesa/main/arrayobj.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/arrayobj.c b/mesalib/src/mesa/main/arrayobj.c index 9255559d5..5959260c2 100644 --- a/mesalib/src/mesa/main/arrayobj.c +++ b/mesalib/src/mesa/main/arrayobj.c @@ -314,8 +314,6 @@ _mesa_update_array_object_max_element(struct gl_context *ctx, if (!ctx->VertexProgram._Current || ctx->VertexProgram._Current == ctx->VertexProgram._TnlProgram) { enabled = _mesa_array_object_get_enabled_ff(arrayObj); - } else if (ctx->VertexProgram._Current->IsNVProgram) { - enabled = _mesa_array_object_get_enabled_nv(arrayObj); } else { enabled = _mesa_array_object_get_enabled_arb(arrayObj); } |