added glBlendFuncSeparate, glMultiDrawArrays, glMultiDrawElements

2 files changed, 109 insertions, 64 deletions

diff --git a/src/mesa/glapi/APIspec b/src/mesa/glapi/APIspec
index 83093805bc..c1cb030168 100644
--- a/src/mesa/glapi/APIspec
+++ b/src/mesa/glapi/APIspec
@@ -1,4 +1,4 @@
-# $Id: APIspec,v 1.12 2002/11/07 16:20:20 brianp Exp $
+# $Id: APIspec,v 1.13 2002/11/07 16:35:01 brianp Exp $
 
 # This file describes all the OpenGL functions.
 # We use a number of Python scripts to parse this file and
@@ -7367,6 +7367,66 @@ offset		643
 
 # OpenGL 1.4
 
+name		BlendFuncSeparate
+alias		BlendFuncSeparateEXT
+return		void
+param		sfactorRGB	GLenum
+param		dfactorRGB	GLenum
+param		sfactorAlpha	GLenum
+param		dfactorAlpha	GLenum
+category	GL_EXT_blend_func_separate
+
+name		FogCoordf
+return		void
+param		coord		GLfloat
+category	1.4
+alias		FogCoordfEXT
+
+name		FogCoordfv
+return		void
+param		coord		const GLfloat *
+category	1.4
+alias		FogCoordfvEXT
+
+name		FogCoordd
+return		void
+param		coord		GLdouble
+category	1.4
+alias		FogCoorddEXT
+
+name		FogCoorddv
+return		void
+param		coord		const GLdouble *
+category	1.4
+alias		FogCoorddvEXT
+
+name		FogCoordPointer
+return		void
+param		type		GLenum
+param		stride		GLsizei
+param		pointer		const GLvoid *
+category	1.4
+alias		FogCoordPointerEXT
+
+name		MultiDrawArrays
+return		void
+param		mode		GLenum
+param		first		GLint *
+param		count		GLsizei *
+param		primcount	GLsizei
+category	GL_EXT_multi_draw_arrays
+alias		MultiDrawArraysEXT
+
+name		MultiDrawElements
+return		void
+param		mode		GLenum
+param		count		const GLsizei *
+param		type		GLenum
+param		indices		const GLvoid **
+param		primcount	GLsizei
+category	GL_EXT_multi_draw_arrays
+alias		MultiDrawElementsEXT
+
 name		PointParameterf
 return		void
 param		pname		GLenum
@@ -7625,39 +7685,6 @@ category	1.4
 alias		WindowPos3svMESA
 
 
-name		FogCoordf
-return		void
-param		coord		GLfloat
-category	1.4
-alias		FogCoordfEXT
-
-name		FogCoordfv
-return		void
-param		coord		const GLfloat *
-category	1.4
-alias		FogCoordfvEXT
-
-name		FogCoordd
-return		void
-param		coord		GLdouble
-category	1.4
-alias		FogCoorddEXT
-
-name		FogCoorddv
-return		void
-param		coord		const GLdouble *
-category	1.4
-alias		FogCoorddvEXT
-
-name		FogCoordPointer
-return		void
-param		type		GLenum
-param		stride		GLsizei
-param		pointer		const GLvoid *
-category	1.4
-alias		FogCoordPointerEXT
-
-
 # GL_EXT_stencil_two_side
 
 name ActiveStencilFaceEXT
diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index a2992e1225..ba6a093787 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -3994,6 +3994,46 @@ KEYWORD1 void KEYWORD2 NAME(PointParameterivNV)(GLenum pname, const GLint * para
    DISPATCH(PointParameterivNV, (pname, params), (F, "glPointParameterivNV(0x%x, %p);\n", pname, (void *) params));
 }
 
+KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparate)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
+{
+   DISPATCH(BlendFuncSeparateEXT, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, "glBlendFuncSeparate(0x%x, 0x%x, 0x%x, 0x%x);\n", sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordf)(GLfloat coord)
+{
+   DISPATCH(FogCoordfEXT, (coord), (F, "glFogCoordf(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordfv)(const GLfloat * coord)
+{
+   DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfv(%p);\n", (void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordd)(GLdouble coord)
+{
+   DISPATCH(FogCoorddEXT, (coord), (F, "glFogCoordd(%f);\n", coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoorddv)(const GLdouble * coord)
+{
+   DISPATCH(FogCoorddvEXT, (coord), (F, "glFogCoorddv(%p);\n", (void *) coord));
+}
+
+KEYWORD1 void KEYWORD2 NAME(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid * pointer)
+{
+   DISPATCH(FogCoordPointerEXT, (type, stride, pointer), (F, "glFogCoordPointer(0x%x, %d, %p);\n", type, stride, (void *) pointer));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiDrawArrays)(GLenum mode, GLint * first, GLsizei * count, GLsizei primcount)
+{
+   DISPATCH(MultiDrawArraysEXT, (mode, first, count, primcount), (F, "glMultiDrawArrays(0x%x, %p, %p, %d);\n", mode, (void *) first, (void *) count, primcount));
+}
+
+KEYWORD1 void KEYWORD2 NAME(MultiDrawElements)(GLenum mode, const GLsizei * count, GLenum type, const GLvoid ** indices, GLsizei primcount)
+{
+   DISPATCH(MultiDrawElementsEXT, (mode, count, type, indices, primcount), (F, "glMultiDrawElements(0x%x, %p, 0x%x, %p, %d);\n", mode, (void *) count, type, (void *) indices, primcount));
+}
+
 KEYWORD1 void KEYWORD2 NAME(PointParameterf)(GLenum pname, GLfloat param)
 {
    DISPATCH(PointParameterfEXT, (pname, param), (F, "glPointParameterf(0x%x, %f);\n", pname, param));
@@ -4179,31 +4219,6 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos3sv)(const GLshort * v)
    DISPATCH(WindowPos3svMESA, (v), (F, "glWindowPos3sv(%p);\n", (void *) v));
 }
 
-KEYWORD1 void KEYWORD2 NAME(FogCoordf)(GLfloat coord)
-{
-   DISPATCH(FogCoordfEXT, (coord), (F, "glFogCoordf(%f);\n", coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoordfv)(const GLfloat * coord)
-{
-   DISPATCH(FogCoordfvEXT, (coord), (F, "glFogCoordfv(%p);\n", (void *) coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoordd)(GLdouble coord)
-{
-   DISPATCH(FogCoorddEXT, (coord), (F, "glFogCoordd(%f);\n", coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoorddv)(const GLdouble * coord)
-{
-   DISPATCH(FogCoorddvEXT, (coord), (F, "glFogCoorddv(%p);\n", (void *) coord));
-}
-
-KEYWORD1 void KEYWORD2 NAME(FogCoordPointer)(GLenum type, GLsizei stride, const GLvoid * pointer)
-{
-   DISPATCH(FogCoordPointerEXT, (type, stride, pointer), (F, "glFogCoordPointer(0x%x, %d, %p);\n", type, stride, (void *) pointer));
-}
-
 KEYWORD1 void KEYWORD2 NAME(ActiveStencilFaceEXT)(GLenum face)
 {
    DISPATCH(ActiveStencilFaceEXT, (face), (F, "glActiveStencilFaceEXT(0x%x);\n", face));
@@ -5096,6 +5111,14 @@ void *UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos3fvARB),
    TABLE_ENTRY(WindowPos3ivARB),
    TABLE_ENTRY(WindowPos3svARB),
+   TABLE_ENTRY(BlendFuncSeparate),
+   TABLE_ENTRY(FogCoordf),
+   TABLE_ENTRY(FogCoordfv),
+   TABLE_ENTRY(FogCoordd),
+   TABLE_ENTRY(FogCoorddv),
+   TABLE_ENTRY(FogCoordPointer),
+   TABLE_ENTRY(MultiDrawArrays),
+   TABLE_ENTRY(MultiDrawElements),
    TABLE_ENTRY(PointParameterf),
    TABLE_ENTRY(PointParameterfv),
    TABLE_ENTRY(PointParameteri),
@@ -5133,11 +5156,6 @@ void *UNUSED_TABLE_NAME[] = {
    TABLE_ENTRY(WindowPos3iv),
    TABLE_ENTRY(WindowPos3s),
    TABLE_ENTRY(WindowPos3sv),
-   TABLE_ENTRY(FogCoordf),
-   TABLE_ENTRY(FogCoordfv),
-   TABLE_ENTRY(FogCoordd),
-   TABLE_ENTRY(FogCoorddv),
-   TABLE_ENTRY(FogCoordPointer),
 };
 #endif /*UNUSED_TABLE_NAME*/