Use ctx->Const.MaxTextureImageUnits and MaxTextureCoordUnits in more places.

[mesa.git] / src / mesa / main / arbprogram.c

diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c
index 99118cf60d569d05d1544b41f7d74fe3cc396eb3..384504e15e627ac10cb433f1abf4b9516f59e44d 100644 (file)
--- a/src/mesa/main/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -240,14 +240,6 @@ _mesa_VertexAttrib4NuivARB(GLuint index, const GLuint *v)
 }
 
 
-void
-_mesa_VertexAttribPointerARB(GLuint index, GLint size, GLenum type,
-                             GLboolean normalized, GLsizei stride,
-                             const GLvoid *pointer)
-{
-}
-
-
 void
 _mesa_EnableVertexAttribArrayARB(GLuint index)
 {
@@ -280,7 +272,7 @@ _mesa_DisableVertexAttribArrayARB(GLuint index)
 
    ctx->Array.VertexAttrib[index].Enabled = GL_FALSE;
    ctx->Array._Enabled &= ~_NEW_ARRAY_ATTRIB(index);
-   ctx->Array.NewState &= ~_NEW_ARRAY_ATTRIB(index);
+   ctx->Array.NewState |= _NEW_ARRAY_ATTRIB(index);
 }