summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/arbprogram.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-05-01 22:44:02 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-05-01 22:44:02 +0000
commit92f9785c727ea10ff5f8dc9770f0e8f388fcea70 (patch)
tree10335899a8205128723f6b459d827e918bbc2d86 /src/mesa/main/arbprogram.c
parent09b00c5ded8e6211c9c79be600bb8c8ecad0d8fc (diff)
downloadexternal_mesa3d-92f9785c727ea10ff5f8dc9770f0e8f388fcea70.zip
external_mesa3d-92f9785c727ea10ff5f8dc9770f0e8f388fcea70.tar.gz
external_mesa3d-92f9785c727ea10ff5f8dc9770f0e8f388fcea70.tar.bz2
Use ctx->Const.MaxTextureImageUnits and MaxTextureCoordUnits in more places.
Misc vertex array / vertex program changes.
Diffstat (limited to 'src/mesa/main/arbprogram.c')
-rw-r--r--src/mesa/main/arbprogram.c10
1 files changed, 1 insertions, 9 deletions
diff --git a/src/mesa/main/arbprogram.c b/src/mesa/main/arbprogram.c
index 99118cf..384504e 100644
--- a/src/mesa/main/arbprogram.c
+++ b/src/mesa/main/arbprogram.c
@@ -241,14 +241,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)
{
GET_CURRENT_CONTEXT(ctx);
@@ -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);
}