summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/mesa/main/state.c10
-rw-r--r--src/mesa/main/varray.c61
-rw-r--r--src/mesa/main/varray.h36
3 files changed, 102 insertions, 5 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 3093da2fe6b..1d04e233885 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.15 2000/05/26 14:44:59 brianp Exp $ */
+/* $Id: state.c,v 1.16 2000/06/12 15:31:20 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -540,6 +540,14 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
exec->GetPixelTexGenParameterivSGIS = _mesa_GetPixelTexGenParameterivSGIS;
exec->GetPixelTexGenParameterfvSGIS = _mesa_GetPixelTexGenParameterfvSGIS;
+ /* 30. GL_EXT_vertex_array */
+ exec->ColorPointerEXT = _mesa_ColorPointerEXT;
+ exec->EdgeFlagPointerEXT = _mesa_EdgeFlagPointerEXT;
+ exec->IndexPointerEXT = _mesa_IndexPointerEXT;
+ exec->NormalPointerEXT = _mesa_NormalPointerEXT;
+ exec->TexCoordPointerEXT = _mesa_TexCoordPointerEXT;
+ exec->VertexPointerEXT = _mesa_VertexPointerEXT;
+
/* 37. GL_EXT_blend_minmax */
#if 0
exec->BlendEquationEXT = _mesa_BlendEquationEXT;
diff --git a/src/mesa/main/varray.c b/src/mesa/main/varray.c
index 5b069c5e76f..072426c6ea0 100644
--- a/src/mesa/main/varray.c
+++ b/src/mesa/main/varray.c
@@ -1,8 +1,8 @@
-/* $Id: varray.c,v 1.21 2000/02/25 03:55:40 keithw Exp $ */
+/* $Id: varray.c,v 1.22 2000/06/12 15:30:51 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.1
+ * Version: 3.3
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -370,6 +370,63 @@ static void gl_CVAEltPointer( GLcontext *ctx, GLenum type, const GLvoid *ptr )
#endif
+
+void
+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
+ GLsizei count, const GLvoid *ptr)
+{
+ (void) count;
+ _mesa_VertexPointer(size, type, stride, ptr);
+}
+
+
+void
+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+ const GLvoid *ptr)
+{
+ (void) count;
+ _mesa_NormalPointer(type, stride, ptr);
+}
+
+
+void
+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
+ const GLvoid *ptr)
+{
+ (void) count;
+ _mesa_ColorPointer(size, type, stride, ptr);
+}
+
+
+void
+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+ const GLvoid *ptr)
+{
+ (void) count;
+ _mesa_IndexPointer(type, stride, ptr);
+}
+
+
+void
+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
+ GLsizei count, const GLvoid *ptr)
+{
+ (void) count;
+ _mesa_TexCoordPointer(size, type, stride, ptr);
+}
+
+
+void
+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr)
+{
+ (void) count;
+ _mesa_EdgeFlagPointer(stride, ptr);
+}
+
+
+
+
+
/* KW: Batch function to exec all the array elements in the input
* buffer prior to transform. Done only the first time a vertex
* buffer is executed or compiled.
diff --git a/src/mesa/main/varray.h b/src/mesa/main/varray.h
index 1387270c814..d08872728b0 100644
--- a/src/mesa/main/varray.h
+++ b/src/mesa/main/varray.h
@@ -1,8 +1,8 @@
-/* $Id: varray.h,v 1.6 2000/01/13 00:35:09 brianp Exp $ */
+/* $Id: varray.h,v 1.7 2000/06/12 15:30:52 brianp Exp $ */
/*
* Mesa 3-D graphics library
- * Version: 3.1
+ * Version: 3.3
*
* Copyright (C) 1999-2000 Brian Paul All Rights Reserved.
*
@@ -59,6 +59,38 @@ _mesa_EdgeFlagPointer(GLsizei stride, const GLvoid *ptr);
extern void
+_mesa_VertexPointerEXT(GLint size, GLenum type, GLsizei stride,
+ GLsizei count, const GLvoid *ptr);
+
+
+extern void
+_mesa_NormalPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+ const GLvoid *ptr);
+
+
+extern void
+_mesa_ColorPointerEXT(GLint size, GLenum type, GLsizei stride, GLsizei count,
+ const GLvoid *ptr);
+
+
+extern void
+_mesa_IndexPointerEXT(GLenum type, GLsizei stride, GLsizei count,
+ const GLvoid *ptr);
+
+
+extern void
+_mesa_TexCoordPointerEXT(GLint size, GLenum type, GLsizei stride,
+ GLsizei count, const GLvoid *ptr);
+
+
+extern void
+_mesa_EdgeFlagPointerEXT(GLsizei stride, GLsizei count, const GLboolean *ptr);
+
+
+
+
+
+extern void
_mesa_ArrayElement( GLint );