added more function templates, changed message format

1 files changed, 773 insertions, 517 deletions

diff --git a/src/mesa/glapi/glapitemp.h b/src/mesa/glapi/glapitemp.h
index 1c394f04d5..bd0a8658ab 100644
--- a/src/mesa/glapi/glapitemp.h
+++ b/src/mesa/glapi/glapitemp.h
@@ -1,4 +1,4 @@
-/* $Id: glapitemp.h,v 1.9 2000/01/28 19:01:45 brianp Exp $ */
+/* $Id: glapitemp.h,v 1.10 2000/01/31 22:54:06 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -89,1537 +89,1537 @@
 
 KEYWORD1 void KEYWORD2 NAME(Accum)(GLenum op, GLfloat value)
 {
-   DISPATCH(Accum, (op, value), ("glAccum(0x%x, %g);\n", op, value));
+   DISPATCH(Accum, (op, value), (F, "glAccum(0x%x, %g);\n", op, value));
 }
 
 KEYWORD1 void KEYWORD2 NAME(AlphaFunc)(GLenum func, GLclampf ref)
 {
-   DISPATCH(AlphaFunc, (func, ref), ("glAlphaFunc(0x%x, %g);\n", func, ref));
+   DISPATCH(AlphaFunc, (func, ref), (F, "glAlphaFunc(0x%x, %g);\n", func, ref));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Begin)(GLenum mode)
 {
-   DISPATCH(Begin, (mode), ("glBegin(0x%x);\n", mode));
+   DISPATCH(Begin, (mode), (F, "glBegin(0x%x);\n", mode));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Bitmap)(GLsizei width, GLsizei height, GLfloat xorig, GLfloat yorig, GLfloat xmove, GLfloat ymove, const GLubyte *bitmap)
 {
-   DISPATCH(Bitmap, (width, height, xorig, yorig, xmove, ymove, bitmap), (";\n"));
+   DISPATCH(Bitmap, (width, height, xorig, yorig, xmove, ymove, bitmap), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BlendFunc)(GLenum sfactor, GLenum dfactor)
 {
-   DISPATCH(BlendFunc, (sfactor, dfactor), (";\n"));
+   DISPATCH(BlendFunc, (sfactor, dfactor), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CallList)(GLuint list)
 {
-   DISPATCH(CallList, (list), ("glCallList(%u);\n", list));
+   DISPATCH(CallList, (list), (F, "glCallList(%u);\n", list));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CallLists)(GLsizei n, GLenum type, const GLvoid *lists)
 {
-   DISPATCH(CallLists, (n, type, lists), (";\n"));
+   DISPATCH(CallLists, (n, type, lists), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Clear)(GLbitfield mask)
 {
-   DISPATCH(Clear, (mask), ("glClear(0x%x);\n", mask));
+   DISPATCH(Clear, (mask), (F, "glClear(0x%x);\n", mask));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClearAccum)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-   DISPATCH(ClearAccum, (red, green, blue, alpha), (";\n"));
+   DISPATCH(ClearAccum, (red, green, blue, alpha), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClearColor)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
-   DISPATCH(ClearColor, (red, green, blue, alpha), (";\n"));
+   DISPATCH(ClearColor, (red, green, blue, alpha), (F, "glClearColor(%f, %f, %f, %f);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClearDepth)(GLclampd depth)
 {
-   DISPATCH(ClearDepth, (depth), (";\n"));
+   DISPATCH(ClearDepth, (depth), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClearIndex)(GLfloat c)
 {
-   DISPATCH(ClearIndex, (c), (";\n"));
+   DISPATCH(ClearIndex, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClearStencil)(GLint s)
 {
-   DISPATCH(ClearStencil, (s), (";\n"));
+   DISPATCH(ClearStencil, (s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClipPlane)(GLenum plane, const GLdouble *equation)
 {
-   DISPATCH(ClipPlane, (plane, equation), (";\n"));
+   DISPATCH(ClipPlane, (plane, equation), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3b)(GLbyte red, GLbyte green, GLbyte blue)
 {
-   DISPATCH(Color3b, (red, green, blue), (";\n"));
+   DISPATCH(Color3b, (red, green, blue), (F, "glColor3b(%d, %d, %d);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3d)(GLdouble red, GLdouble green, GLdouble blue)
 {
-   DISPATCH(Color3d, (red, green, blue), (";\n"));
+   DISPATCH(Color3d, (red, green, blue), (F, "glColor3d(%f, %f, %f);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3f)(GLfloat red, GLfloat green, GLfloat blue)
 {
-   DISPATCH(Color3f, (red, green, blue), ("glColor3f(%g, %g, %g);\n", red, green, blue));
+   DISPATCH(Color3f, (red, green, blue), (F, "glColor3f(%g, %g, %g);\n", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3i)(GLint red, GLint green, GLint blue)
 {
-   DISPATCH(Color3i, (red, green, blue), (";\n"));
+   DISPATCH(Color3i, (red, green, blue), (F, "glColor3i(%d, %d, %d);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3s)(GLshort red, GLshort green, GLshort blue)
 {
-   DISPATCH(Color3s, (red, green, blue), (";\n"));
+   DISPATCH(Color3s, (red, green, blue), (F, "glColor3s(%d, %d, %d);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3ub)(GLubyte red, GLubyte green, GLubyte blue)
 {
-   DISPATCH(Color3ub, (red, green, blue), (";\n"));
+   DISPATCH(Color3ub, (red, green, blue), (F, "glColor3ub(%u, %u, %u);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3ui)(GLuint red, GLuint green, GLuint blue)
 {
-   DISPATCH(Color3ui, (red, green, blue), (";\n"));
+   DISPATCH(Color3ui, (red, green, blue), (F, "glColor3ui(%u, %u, %u);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3us)(GLushort red, GLushort green, GLushort blue)
 {
-   DISPATCH(Color3us, (red, green, blue), (";\n"));
+   DISPATCH(Color3us, (red, green, blue), (F, "glColor3us(%u, %u, %u);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4b)(GLbyte red, GLbyte green, GLbyte blue, GLbyte alpha)
 {
-   DISPATCH(Color4b, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4b, (red, green, blue, alpha), (F, "glColor4b(%d, %d, %d, %d);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4d)(GLdouble red, GLdouble green, GLdouble blue, GLdouble alpha)
 {
-   DISPATCH(Color4d, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4d, (red, green, blue, alpha), (F, "glColor4d(%f, %f, %f, %f);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4f)(GLfloat red, GLfloat green, GLfloat blue, GLfloat alpha)
 {
-   DISPATCH(Color4f, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4f, (red, green, blue, alpha), (F, "glColor4b(%f, %f, %f, %f);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4i)(GLint red, GLint green, GLint blue, GLint alpha)
 {
-   DISPATCH(Color4i, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4i, (red, green, blue, alpha), (F, "glColor4i(%d, %d, %d);", red, green, blue));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4s)(GLshort red, GLshort green, GLshort blue, GLshort alpha)
 {
-   DISPATCH(Color4s, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4s, (red, green, blue, alpha), (F, "glColor4s(%d, %d, %d, %d);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4ub)(GLubyte red, GLubyte green, GLubyte blue, GLubyte alpha)
 {
-   DISPATCH(Color4ub, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4ub, (red, green, blue, alpha), (F, "glColor4ub(%u, %u, %u, %u);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4ui)(GLuint red, GLuint green, GLuint blue, GLuint alpha)
 {
-   DISPATCH(Color4ui, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4ui, (red, green, blue, alpha), (F, "glColor4ui(%u, %u, %u, %u);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4us)(GLushort red, GLushort green, GLushort blue, GLushort alpha)
 {
-   DISPATCH(Color4us, (red, green, blue, alpha), (";\n"));
+   DISPATCH(Color4us, (red, green, blue, alpha), (F, "glColor4us(%u, %u, %u, %u);", red, green, blue, alpha));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3bv)(const GLbyte *v)
 {
-   DISPATCH(Color3bv, (v), (";\n"));
+   DISPATCH(Color3bv, (v), (F, "glColor3bf(%p);", v));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3dv)(const GLdouble *v)
 {
-   DISPATCH(Color3dv, (v), (";\n"));
+   DISPATCH(Color3dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3fv)(const GLfloat *v)
 {
-   DISPATCH(Color3fv, (v), (";\n"));
+   DISPATCH(Color3fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3iv)(const GLint *v)
 {
-   DISPATCH(Color3iv, (v), (";\n"));
+   DISPATCH(Color3iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3sv)(const GLshort *v)
 {
-   DISPATCH(Color3sv, (v), (";\n"));
+   DISPATCH(Color3sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3ubv)(const GLubyte *v)
 {
-   DISPATCH(Color3ubv, (v), (";\n"));
+   DISPATCH(Color3ubv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3uiv)(const GLuint *v)
 {
-   DISPATCH(Color3uiv, (v), (";\n"));
+   DISPATCH(Color3uiv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color3usv)(const GLushort *v)
 {
-   DISPATCH(Color3usv, (v), (";\n"));
+   DISPATCH(Color3usv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4bv)(const GLbyte *v)
 {
-   DISPATCH(Color4bv, (v), (";\n"));
+   DISPATCH(Color4bv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4dv)(const GLdouble *v)
 {
-   DISPATCH(Color4dv, (v), (";\n"));
+   DISPATCH(Color4dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4fv)(const GLfloat *v)
 {
-   DISPATCH(Color4fv, (v), (";\n"));
+   DISPATCH(Color4fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4iv)(const GLint *v)
 {
-   DISPATCH(Color4iv, (v), (";\n"));
+   DISPATCH(Color4iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4sv)(const GLshort *v)
 {
-   DISPATCH(Color4sv, (v), (";\n"));
+   DISPATCH(Color4sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4ubv)(const GLubyte *v)
 {
-   DISPATCH(Color4ubv, (v), (";\n"));
+   DISPATCH(Color4ubv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4uiv)(const GLuint *v)
 {
-   DISPATCH(Color4uiv, (v), (";\n"));
+   DISPATCH(Color4uiv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Color4usv)(const GLushort *v)
 {
-   DISPATCH(Color4usv, (v), (";\n"));
+   DISPATCH(Color4usv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorMask)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha)
 {
-   DISPATCH(ColorMask, (red, green, blue, alpha), (";\n"));
+   DISPATCH(ColorMask, (red, green, blue, alpha), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorMaterial)(GLenum face, GLenum mode)
 {
-   DISPATCH(ColorMaterial, (face, mode), (";\n"));
+   DISPATCH(ColorMaterial, (face, mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum type)
 {
-   DISPATCH(CopyPixels, (x, y, width, height, type), (";\n"));
+   DISPATCH(CopyPixels, (x, y, width, height, type), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CullFace)(GLenum mode)
 {
-   DISPATCH(CullFace, (mode), (";\n"));
+   DISPATCH(CullFace, (mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DepthFunc)(GLenum func)
 {
-   DISPATCH(DepthFunc, (func), (";\n"));
+   DISPATCH(DepthFunc, (func), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DepthMask)(GLboolean flag)
 {
-   DISPATCH(DepthMask, (flag), (";\n"));
+   DISPATCH(DepthMask, (flag), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DepthRange)(GLclampd nearVal, GLclampd farVal)
 {
-   DISPATCH(DepthRange, (nearVal, farVal), (";\n"));
+   DISPATCH(DepthRange, (nearVal, farVal), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DeleteLists)(GLuint list, GLsizei range)
 {
-   DISPATCH(DeleteLists, (list, range), (";\n"));
+   DISPATCH(DeleteLists, (list, range), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Disable)(GLenum cap)
 {
-   DISPATCH(Disable, (cap), ("glDisable(0x%x);\n", cap));
+   DISPATCH(Disable, (cap), (F, "glDisable(0x%x);\n", cap));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DrawBuffer)(GLenum mode)
 {
-   DISPATCH(DrawBuffer, (mode), (";\n"));
+   DISPATCH(DrawBuffer, (mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DrawElements)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices)
 {
-   DISPATCH(DrawElements, (mode, count, type, indices), (";\n"));
+   DISPATCH(DrawElements, (mode, count, type, indices), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DrawPixels)(GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(DrawPixels, (width, height, format, type, pixels), (";\n"));
+   DISPATCH(DrawPixels, (width, height, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Enable)(GLenum cap)
 {
-   DISPATCH(Enable, (cap), ("glEnable(0x%x);\n", cap));
+   DISPATCH(Enable, (cap), (F, "glEnable(0x%x);\n", cap));
 }
 
 KEYWORD1 void KEYWORD2 NAME(End)(void)
 {
-   DISPATCH(End, (), ("glEnd();\n"));
+   DISPATCH(End, (), (F, "glEnd();"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EndList)(void)
 {
-   DISPATCH(EndList, (), (";\n"));
+   DISPATCH(EndList, (), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord1d)(GLdouble u)
 {
-   DISPATCH(EvalCoord1d, (u), (";\n"));
+   DISPATCH(EvalCoord1d, (u), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord1f)(GLfloat u)
 {
-   DISPATCH(EvalCoord1f, (u), (";\n"));
+   DISPATCH(EvalCoord1f, (u), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord1dv)(const GLdouble *u)
 {
-   DISPATCH(EvalCoord1dv, (u), (";\n"));
+   DISPATCH(EvalCoord1dv, (u), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord1fv)(const GLfloat *u)
 {
-   DISPATCH(EvalCoord1fv, (u), (";\n"));
+   DISPATCH(EvalCoord1fv, (u), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord2d)(GLdouble u, GLdouble v)
 {
-   DISPATCH(EvalCoord2d, (u, v), (";\n"));
+   DISPATCH(EvalCoord2d, (u, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord2f)(GLfloat u, GLfloat v)
 {
-   DISPATCH(EvalCoord2f, (u, v), (";\n"));
+   DISPATCH(EvalCoord2f, (u, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord2dv)(const GLdouble *u)
 {
-   DISPATCH(EvalCoord2dv, (u), (";\n"));
+   DISPATCH(EvalCoord2dv, (u), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalCoord2fv)(const GLfloat *u)
 {
-   DISPATCH(EvalCoord2fv, (u), (";\n"));
+   DISPATCH(EvalCoord2fv, (u), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalPoint1)(GLint i)
 {
-   DISPATCH(EvalPoint1, (i), (";\n"));
+   DISPATCH(EvalPoint1, (i), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalPoint2)(GLint i, GLint j)
 {
-   DISPATCH(EvalPoint2, (i, j), (";\n"));
+   DISPATCH(EvalPoint2, (i, j), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalMesh1)(GLenum mode, GLint i1, GLint i2)
 {
-   DISPATCH(EvalMesh1, (mode, i1, i2), (";\n"));
+   DISPATCH(EvalMesh1, (mode, i1, i2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EdgeFlag)(GLboolean flag)
 {
-   DISPATCH(EdgeFlag, (flag), (";\n"));
+   DISPATCH(EdgeFlag, (flag), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EdgeFlagv)(const GLboolean *flag)
 {
-   DISPATCH(EdgeFlagv, (flag), (";\n"));
+   DISPATCH(EdgeFlagv, (flag), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EvalMesh2)(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2)
 {
-   DISPATCH(EvalMesh2, (mode, i1, i2, j1, j2), (";\n"));
+   DISPATCH(EvalMesh2, (mode, i1, i2, j1, j2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(FeedbackBuffer)(GLsizei size, GLenum type, GLfloat *buffer)
 {
-   DISPATCH(FeedbackBuffer, (size, type, buffer), (";\n"));
+   DISPATCH(FeedbackBuffer, (size, type, buffer), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Finish)(void)
 {
-   DISPATCH(Finish, (), (";\n"));
+   DISPATCH(Finish, (), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Flush)(void)
 {
-   DISPATCH(Flush, (), (";\n"));
+   DISPATCH(Flush, (), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Fogf)(GLenum pname, GLfloat param)
 {
-   DISPATCH(Fogf, (pname, param), (";\n"));
+   DISPATCH(Fogf, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Fogi)(GLenum pname, GLint param)
 {
-   DISPATCH(Fogi, (pname, param), (";\n"));
+   DISPATCH(Fogi, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Fogfv)(GLenum pname, const GLfloat *params)
 {
-   DISPATCH(Fogfv, (pname, params), (";\n"));
+   DISPATCH(Fogfv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Fogiv)(GLenum pname, const GLint *params)
 {
-   DISPATCH(Fogiv, (pname, params), (";\n"));
+   DISPATCH(Fogiv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(FrontFace)(GLenum mode)
 {
-   DISPATCH(FrontFace, (mode), (";\n"));
+   DISPATCH(FrontFace, (mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Frustum)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval)
 {
-   DISPATCH(Frustum, (left, right, bottom, top, nearval, farval), (";\n"));
+   DISPATCH(Frustum, (left, right, bottom, top, nearval, farval), (F, ";"));
 }
 
 KEYWORD1 GLuint KEYWORD2 NAME(GenLists)(GLsizei range)
 {
-   RETURN_DISPATCH(GenLists, (range), ("glGenLists(%d);\n", range));
+   RETURN_DISPATCH(GenLists, (range), (F, "glGenLists(%d);\n", range));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetBooleanv)(GLenum pname, GLboolean *params)
 {
-   DISPATCH(GetBooleanv, (pname, params), (";\n"));
+   DISPATCH(GetBooleanv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetClipPlane)(GLenum plane, GLdouble *equation)
 {
-   DISPATCH(GetClipPlane, (plane, equation), (";\n"));
+   DISPATCH(GetClipPlane, (plane, equation), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetDoublev)(GLenum pname, GLdouble *params)
 {
-   DISPATCH(GetDoublev, (pname, params), (";\n"));
+   DISPATCH(GetDoublev, (pname, params), (F, ";"));
 }
 
 KEYWORD1 GLenum KEYWORD2 NAME(GetError)(void)
 {
-   RETURN_DISPATCH(GetError, (), ("glGetError();\n"));
+   RETURN_DISPATCH(GetError, (), (F, "glGetError();"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetFloatv)(GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetFloatv, (pname, params), (";\n"));
+   DISPATCH(GetFloatv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetIntegerv)(GLenum pname, GLint *params)
 {
-   DISPATCH(GetIntegerv, (pname, params), (";\n"));
+   DISPATCH(GetIntegerv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetLightfv)(GLenum light, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetLightfv, (light, pname, params), (";\n"));
+   DISPATCH(GetLightfv, (light, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetLightiv)(GLenum light, GLenum pname, GLint *params)
 {
-   DISPATCH(GetLightiv, (light, pname, params), (";\n"));
+   DISPATCH(GetLightiv, (light, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMapdv)(GLenum target, GLenum query, GLdouble *v)
 {
-   DISPATCH(GetMapdv, (target, query, v), (";\n"));
+   DISPATCH(GetMapdv, (target, query, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMapfv)(GLenum target, GLenum query, GLfloat *v)
 {
-   DISPATCH(GetMapfv, (target, query, v), (";\n"));
+   DISPATCH(GetMapfv, (target, query, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMapiv)(GLenum target, GLenum query, GLint *v)
 {
-   DISPATCH(GetMapiv, (target, query, v), (";\n"));
+   DISPATCH(GetMapiv, (target, query, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMaterialfv)(GLenum face, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetMaterialfv, (face, pname, params), (";\n"));
+   DISPATCH(GetMaterialfv, (face, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMaterialiv)(GLenum face, GLenum pname, GLint *params)
 {
-   DISPATCH(GetMaterialiv, (face, pname, params), (";\n"));
+   DISPATCH(GetMaterialiv, (face, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetPixelMapfv)(GLenum map, GLfloat *values)
 {
-   DISPATCH(GetPixelMapfv, (map, values), (";\n"));
+   DISPATCH(GetPixelMapfv, (map, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetPixelMapuiv)(GLenum map, GLuint *values)
 {
-   DISPATCH(GetPixelMapuiv, (map, values), (";\n"));
+   DISPATCH(GetPixelMapuiv, (map, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetPixelMapusv)(GLenum map, GLushort *values)
 {
-   DISPATCH(GetPixelMapusv, (map, values), (";\n"));
+   DISPATCH(GetPixelMapusv, (map, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetPolygonStipple)(GLubyte *mask)
 {
-   DISPATCH(GetPolygonStipple, (mask), (";\n"));
+   DISPATCH(GetPolygonStipple, (mask), (F, ";"));
 }
 
 KEYWORD1 const GLubyte * KEYWORD2 NAME(GetString)(GLenum name)
 {
-   RETURN_DISPATCH(GetString, (name), ("glGetString(0x%x);\n", name));
+   RETURN_DISPATCH(GetString, (name), (F, "glGetString(0x%x);\n", name));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexEnvfv)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetTexEnvfv, (target, pname, params), (";\n"));
+   DISPATCH(GetTexEnvfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexEnviv)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetTexEnviv, (target, pname, params), (";\n"));
+   DISPATCH(GetTexEnviv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexGeniv)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetTexGeniv, (target, pname, params), (";\n"));
+   DISPATCH(GetTexGeniv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexGendv)(GLenum target, GLenum pname, GLdouble *params)
 {
-   DISPATCH(GetTexGendv, (target, pname, params), (";\n"));
+   DISPATCH(GetTexGendv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexGenfv)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetTexGenfv, (target, pname, params), (";\n"));
+   DISPATCH(GetTexGenfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexImage)(GLenum target, GLint level, GLenum format, GLenum type, GLvoid *pixels)
 {
-   DISPATCH(GetTexImage, (target, level, format, type, pixels), (";\n"));
+   DISPATCH(GetTexImage, (target, level, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexLevelParameterfv)(GLenum target, GLint level, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetTexLevelParameterfv, (target, level, pname, params), (";\n"));
+   DISPATCH(GetTexLevelParameterfv, (target, level, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexLevelParameteriv)(GLenum target, GLint level, GLenum pname, GLint *params)
 {
-   DISPATCH(GetTexLevelParameteriv, (target, level, pname, params), (";\n"));
+   DISPATCH(GetTexLevelParameteriv, (target, level, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexParameterfv)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetTexParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(GetTexParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetTexParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetTexParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(GetTexParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Hint)(GLenum target, GLenum mode)
 {
-   DISPATCH(Hint, (target, mode), (";\n"));
+   DISPATCH(Hint, (target, mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexd)(GLdouble c)
 {
-   DISPATCH(Indexd, (c), (";\n"));
+   DISPATCH(Indexd, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexdv)(const GLdouble *c)
 {
-   DISPATCH(Indexdv, (c), (";\n"));
+   DISPATCH(Indexdv, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexf)(GLfloat c)
 {
-   DISPATCH(Indexf, (c), (";\n"));
+   DISPATCH(Indexf, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexfv)(const GLfloat *c)
 {
-   DISPATCH(Indexfv, (c), (";\n"));
+   DISPATCH(Indexfv, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexi)(GLint c)
 {
-   DISPATCH(Indexi, (c), (";\n"));
+   DISPATCH(Indexi, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexiv)(const GLint *c)
 {
-   DISPATCH(Indexiv, (c), (";\n"));
+   DISPATCH(Indexiv, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexs)(GLshort c)
 {
-   DISPATCH(Indexs, (c), (";\n"));
+   DISPATCH(Indexs, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexsv)(const GLshort *c)
 {
-   DISPATCH(Indexsv, (c), (";\n"));
+   DISPATCH(Indexsv, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(IndexMask)(GLuint mask)
 {
-   DISPATCH(IndexMask, (mask), (";\n"));
+   DISPATCH(IndexMask, (mask), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(InitNames)(void)
 {
-   DISPATCH(InitNames, (), (";\n"));
+   DISPATCH(InitNames, (), (F, ";"));
 }
 
 KEYWORD1 GLboolean KEYWORD2 NAME(IsEnabled)(GLenum cap)
 {
-   RETURN_DISPATCH(IsEnabled, (cap), ("glIsEnabled(0x%x);\n", cap));
+   RETURN_DISPATCH(IsEnabled, (cap), (F, "glIsEnabled(0x%x);\n", cap));
 }
 
 KEYWORD1 GLboolean KEYWORD2 NAME(IsList)(GLuint list)
 {
-   RETURN_DISPATCH(IsList, (list), ("glIsList(%u);\n", list));
+   RETURN_DISPATCH(IsList, (list), (F, "glIsList(%u);\n", list));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Lightf)(GLenum light, GLenum pname, GLfloat param)
 {
-   DISPATCH(Lightf, (light, pname, param), (";\n"));
+   DISPATCH(Lightf, (light, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Lighti)(GLenum light, GLenum pname, GLint param)
 {
-   DISPATCH(Lighti, (light, pname, param), (";\n"));
+   DISPATCH(Lighti, (light, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Lightfv)(GLenum light, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(Lightfv, (light, pname, params), (";\n"));
+   DISPATCH(Lightfv, (light, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Lightiv)(GLenum light, GLenum pname, const GLint *params)
 {
-   DISPATCH(Lightiv, (light, pname, params), (";\n"));
+   DISPATCH(Lightiv, (light, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LightModelf)(GLenum pname, GLfloat param)
 {
-   DISPATCH(LightModelf, (pname, param), (";\n"));
+   DISPATCH(LightModelf, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LightModeli)(GLenum pname, GLint param)
 {
-   DISPATCH(LightModeli, (pname, param), (";\n"));
+   DISPATCH(LightModeli, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LightModelfv)(GLenum pname, const GLfloat *params)
 {
-   DISPATCH(LightModelfv, (pname, params), (";\n"));
+   DISPATCH(LightModelfv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LightModeliv)(GLenum pname, const GLint *params)
 {
-   DISPATCH(LightModeliv, (pname, params), (";\n"));
+   DISPATCH(LightModeliv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LineWidth)(GLfloat width)
 {
-   DISPATCH(LineWidth, (width), (";\n"));
+   DISPATCH(LineWidth, (width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LineStipple)(GLint factor, GLushort pattern)
 {
-   DISPATCH(LineStipple, (factor, pattern), (";\n"));
+   DISPATCH(LineStipple, (factor, pattern), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ListBase)(GLuint base)
 {
-   DISPATCH(ListBase, (base), (";\n"));
+   DISPATCH(ListBase, (base), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LoadIdentity)(void)
 {
-   DISPATCH(LoadIdentity, (), (";\n"));
+   DISPATCH(LoadIdentity, (), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LoadMatrixd)(const GLdouble *m)
 {
-   DISPATCH(LoadMatrixd, (m), (";\n"));
+   DISPATCH(LoadMatrixd, (m), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LoadMatrixf)(const GLfloat *m)
 {
-   DISPATCH(LoadMatrixf, (m), (";\n"));
+   DISPATCH(LoadMatrixf, (m), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LoadName)(GLuint name)
 {
-   DISPATCH(LoadName, (name), (";\n"));
+   DISPATCH(LoadName, (name), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LogicOp)(GLenum opcode)
 {
-   DISPATCH(LogicOp, (opcode), (";\n"));
+   DISPATCH(LogicOp, (opcode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Map1d)(GLenum target, GLdouble u1, GLdouble u2, GLint stride, GLint order, const GLdouble *points)
 {
-   DISPATCH(Map1d, (target, u1, u2, stride, order, points), (";\n"));
+   DISPATCH(Map1d, (target, u1, u2, stride, order, points), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Map1f)(GLenum target, GLfloat u1, GLfloat u2, GLint stride, GLint order, const GLfloat *points)
 {
-   DISPATCH(Map1f, (target, u1, u2, stride, order, points), (";\n"));
+   DISPATCH(Map1f, (target, u1, u2, stride, order, points), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Map2d)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, const GLdouble *points)
 {
-   DISPATCH(Map2d, (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points), (";\n"));
+   DISPATCH(Map2d, (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Map2f)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, const GLfloat *points)
 {
-   DISPATCH(Map2f, (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points), (";\n"));
+   DISPATCH(Map2f, (target, u1, u2, ustride, uorder, v1, v2, vstride, vorder, points), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MapGrid1d)(GLint un, GLdouble u1, GLdouble u2)
 {
-   DISPATCH(MapGrid1d, (un, u1, u2), (";\n"));
+   DISPATCH(MapGrid1d, (un, u1, u2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MapGrid1f)(GLint un, GLfloat u1, GLfloat u2)
 {
-   DISPATCH(MapGrid1f, (un, u1, u2), (";\n"));
+   DISPATCH(MapGrid1f, (un, u1, u2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MapGrid2d)(GLint un, GLdouble u1, GLdouble u2, GLint vn, GLdouble v1, GLdouble v2)
 {
-   DISPATCH(MapGrid2d, (un, u1, u2, vn, v1, v2), (";\n"));
+   DISPATCH(MapGrid2d, (un, u1, u2, vn, v1, v2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MapGrid2f)(GLint un, GLfloat u1, GLfloat u2, GLint vn, GLfloat v1, GLfloat v2)
 {
-   DISPATCH(MapGrid2f, (un, u1, u2, vn, v1, v2), (";\n"));
+   DISPATCH(MapGrid2f, (un, u1, u2, vn, v1, v2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Materialf)(GLenum face, GLenum pname, GLfloat param)
 {
-   DISPATCH(Materialf, (face, pname, param), (";\n"));
+   DISPATCH(Materialf, (face, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Materiali)(GLenum face, GLenum pname, GLint param)
 {
-   DISPATCH(Materiali, (face, pname, param), (";\n"));
+   DISPATCH(Materiali, (face, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Materialfv)(GLenum face, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(Materialfv, (face, pname, params), (";\n"));
+   DISPATCH(Materialfv, (face, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Materialiv)(GLenum face, GLenum pname, const GLint *params)
 {
-   DISPATCH(Materialiv, (face, pname, params), (";\n"));
+   DISPATCH(Materialiv, (face, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MatrixMode)(GLenum mode)
 {
-   DISPATCH(MatrixMode, (mode), (";\n"));
+   DISPATCH(MatrixMode, (mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultMatrixd)(const GLdouble *m)
 {
-   DISPATCH(MultMatrixd, (m), (";\n"));
+   DISPATCH(MultMatrixd, (m), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultMatrixf)(const GLfloat *m)
 {
-   DISPATCH(MultMatrixf, (m), (";\n"));
+   DISPATCH(MultMatrixf, (m), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(NewList)(GLuint list, GLenum mode)
 {
-   DISPATCH(NewList, (list, mode), (";\n"));
+   DISPATCH(NewList, (list, mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3b)(GLbyte nx, GLbyte ny, GLbyte nz)
 {
-   DISPATCH(Normal3b, (nx, ny, nz), (";\n"));
+   DISPATCH(Normal3b, (nx, ny, nz), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3bv)(const GLbyte *v)
 {
-   DISPATCH(Normal3bv, (v), (";\n"));
+   DISPATCH(Normal3bv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3d)(GLdouble nx, GLdouble ny, GLdouble nz)
 {
-   DISPATCH(Normal3d, (nx, ny, nz), (";\n"));
+   DISPATCH(Normal3d, (nx, ny, nz), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3dv)(const GLdouble *v)
 {
-   DISPATCH(Normal3dv, (v), (";\n"));
+   DISPATCH(Normal3dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3f)(GLfloat nx, GLfloat ny, GLfloat nz)
 {
-   DISPATCH(Normal3f, (nx, ny, nz), ("glNormal3f(%g, %g, %g);\n", nx, ny, nz));
+   DISPATCH(Normal3f, (nx, ny, nz), (F, "glNormal3f(%g, %g, %g);\n", nx, ny, nz));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3fv)(const GLfloat *v)
 {
-   DISPATCH(Normal3fv, (v), (";\n"));
+   DISPATCH(Normal3fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3i)(GLint nx, GLint ny, GLint nz)
 {
-   DISPATCH(Normal3i, (nx, ny, nz), (";\n"));
+   DISPATCH(Normal3i, (nx, ny, nz), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3iv)(const GLint *v)
 {
-   DISPATCH(Normal3iv, (v), (";\n"));
+   DISPATCH(Normal3iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3s)(GLshort nx, GLshort ny, GLshort nz)
 {
-   DISPATCH(Normal3s, (nx, ny, nz), (";\n"));
+   DISPATCH(Normal3s, (nx, ny, nz), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Normal3sv)(const GLshort *v)
 {
-   DISPATCH(Normal3sv, (v), (";\n"));
+   DISPATCH(Normal3sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Ortho)(GLdouble left, GLdouble right, GLdouble bottom, GLdouble top, GLdouble nearval, GLdouble farval)
 {
-   DISPATCH(Ortho, (left, right, bottom, top, nearval, farval), (";\n"));
+   DISPATCH(Ortho, (left, right, bottom, top, nearval, farval), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PassThrough)(GLfloat token)
 {
-   DISPATCH(PassThrough, (token), (";\n"));
+   DISPATCH(PassThrough, (token), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelMapfv)(GLenum map, GLint mapsize, const GLfloat *values)
 {
-   DISPATCH(PixelMapfv, (map, mapsize, values), (";\n"));
+   DISPATCH(PixelMapfv, (map, mapsize, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelMapuiv)(GLenum map, GLint mapsize, const GLuint *values)
 {
-   DISPATCH(PixelMapuiv, (map, mapsize, values), (";\n"));
+   DISPATCH(PixelMapuiv, (map, mapsize, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelMapusv)(GLenum map, GLint mapsize, const GLushort *values)
 {
-   DISPATCH(PixelMapusv, (map, mapsize, values), (";\n"));
+   DISPATCH(PixelMapusv, (map, mapsize, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelStoref)(GLenum pname, GLfloat param)
 {
-   DISPATCH(PixelStoref, (pname, param), (";\n"));
+   DISPATCH(PixelStoref, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelStorei)(GLenum pname, GLint param)
 {
-   DISPATCH(PixelStorei, (pname, param), (";\n"));
+   DISPATCH(PixelStorei, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelTransferf)(GLenum pname, GLfloat param)
 {
-   DISPATCH(PixelTransferf, (pname, param), (";\n"));
+   DISPATCH(PixelTransferf, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelTransferi)(GLenum pname, GLint param)
 {
-   DISPATCH(PixelTransferi, (pname, param), (";\n"));
+   DISPATCH(PixelTransferi, (pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PixelZoom)(GLfloat xfactor, GLfloat yfactor)
 {
-   DISPATCH(PixelZoom, (xfactor, yfactor), (";\n"));
+   DISPATCH(PixelZoom, (xfactor, yfactor), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PointSize)(GLfloat size)
 {
-   DISPATCH(PointSize, (size), (";\n"));
+   DISPATCH(PointSize, (size), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PolygonMode)(GLenum face, GLenum mode)
 {
-   DISPATCH(PolygonMode, (face, mode), (";\n"));
+   DISPATCH(PolygonMode, (face, mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PolygonStipple)(const GLubyte *pattern)
 {
-   DISPATCH(PolygonStipple, (pattern), (";\n"));
+   DISPATCH(PolygonStipple, (pattern), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PopAttrib)(void)
 {
-   DISPATCH(PopAttrib, (), (";\n"));
+   DISPATCH(PopAttrib, (), (F, "glPopAttrib();"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PopMatrix)(void)
 {
-   DISPATCH(PopMatrix, (), ("glPopMatrix();\n"));
+   DISPATCH(PopMatrix, (), (F, "glPopMatrix();"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PopName)(void)
 {
-   DISPATCH(PopName, (), (";\n"));
+   DISPATCH(PopName, (), (F, "glPopName();"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PushAttrib)(GLbitfield mask)
 {
-   DISPATCH(PushAttrib, (mask), (";\n"));
+   DISPATCH(PushAttrib, (mask), (F, "glPushAttrib(%x)", mask));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PushMatrix)(void)
 {
-   DISPATCH(PushMatrix, (), ("glPushMatrix();\n"));
+   DISPATCH(PushMatrix, (), (F, "glPushMatrix();"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PushName)(GLuint name)
 {
-   DISPATCH(PushName, (name), (";\n"));
+   DISPATCH(PushName, (name), (F, "glPushName(%u)", name));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2d)(GLdouble x, GLdouble y)
 {
-   DISPATCH(RasterPos2d, (x, y), (";\n"));
+   DISPATCH(RasterPos2d, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2f)(GLfloat x, GLfloat y)
 {
-   DISPATCH(RasterPos2f, (x, y), (";\n"));
+   DISPATCH(RasterPos2f, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2i)(GLint x, GLint y)
 {
-   DISPATCH(RasterPos2i, (x, y), (";\n"));
+   DISPATCH(RasterPos2i, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2s)(GLshort x, GLshort y)
 {
-   DISPATCH(RasterPos2s, (x, y), (";\n"));
+   DISPATCH(RasterPos2s, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3d)(GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(RasterPos3d, (x, y, z), (";\n"));
+   DISPATCH(RasterPos3d, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3f)(GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(RasterPos3f, (x, y, z), (";\n"));
+   DISPATCH(RasterPos3f, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3i)(GLint x, GLint y, GLint z)
 {
-   DISPATCH(RasterPos3i, (x, y, z), (";\n"));
+   DISPATCH(RasterPos3i, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3s)(GLshort x, GLshort y, GLshort z)
 {
-   DISPATCH(RasterPos3s, (x, y, z), (";\n"));
+   DISPATCH(RasterPos3s, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-   DISPATCH(RasterPos4d, (x, y, z, w), (";\n"));
+   DISPATCH(RasterPos4d, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   DISPATCH(RasterPos4f, (x, y, z, w), (";\n"));
+   DISPATCH(RasterPos4f, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4i)(GLint x, GLint y, GLint z, GLint w)
 {
-   DISPATCH(RasterPos4i, (x, y, z, w), (";\n"));
+   DISPATCH(RasterPos4i, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4s)(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-   DISPATCH(RasterPos4s, (x, y, z, w), (";\n"));
+   DISPATCH(RasterPos4s, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2dv)(const GLdouble *v)
 {
-   DISPATCH(RasterPos2dv, (v), (";\n"));
+   DISPATCH(RasterPos2dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2fv)(const GLfloat *v)
 {
-   DISPATCH(RasterPos2fv, (v), (";\n"));
+   DISPATCH(RasterPos2fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2iv)(const GLint *v)
 {
-   DISPATCH(RasterPos2iv, (v), (";\n"));
+   DISPATCH(RasterPos2iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos2sv)(const GLshort *v)
 {
-   DISPATCH(RasterPos2sv, (v), (";\n"));
+   DISPATCH(RasterPos2sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3dv)(const GLdouble *v)
 {
-   DISPATCH(RasterPos3dv, (v), (";\n"));
+   DISPATCH(RasterPos3dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3fv)(const GLfloat *v)
 {
-   DISPATCH(RasterPos3fv, (v), (";\n"));
+   DISPATCH(RasterPos3fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3iv)(const GLint *v)
 {
-   DISPATCH(RasterPos3iv, (v), (";\n"));
+   DISPATCH(RasterPos3iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos3sv)(const GLshort *v)
 {
-   DISPATCH(RasterPos3sv, (v), (";\n"));
+   DISPATCH(RasterPos3sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4dv)(const GLdouble *v)
 {
-   DISPATCH(RasterPos4dv, (v), (";\n"));
+   DISPATCH(RasterPos4dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4fv)(const GLfloat *v)
 {
-   DISPATCH(RasterPos4fv, (v), (";\n"));
+   DISPATCH(RasterPos4fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4iv)(const GLint *v)
 {
-   DISPATCH(RasterPos4iv, (v), (";\n"));
+   DISPATCH(RasterPos4iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(RasterPos4sv)(const GLshort *v)
 {
-   DISPATCH(RasterPos4sv, (v), (";\n"));
+   DISPATCH(RasterPos4sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ReadBuffer)(GLenum mode)
 {
-   DISPATCH(ReadBuffer, (mode), (";\n"));
+   DISPATCH(ReadBuffer, (mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ReadPixels)(GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels)
 {
-   DISPATCH(ReadPixels, (x, y, width, height, format, type, pixels), (";\n"));
+   DISPATCH(ReadPixels, (x, y, width, height, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rectd)(GLdouble x1, GLdouble y1, GLdouble x2, GLdouble y2)
 {
-   DISPATCH(Rectd, (x1, y1, x2, y2), (";\n"));
+   DISPATCH(Rectd, (x1, y1, x2, y2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rectdv)(const GLdouble *v1, const GLdouble *v2)
 {
-   DISPATCH(Rectdv, (v1, v2), (";\n"));
+   DISPATCH(Rectdv, (v1, v2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rectf)(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2)
 {
-   DISPATCH(Rectf, (x1, y1, x2, y2), (";\n"));
+   DISPATCH(Rectf, (x1, y1, x2, y2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rectfv)(const GLfloat *v1, const GLfloat *v2)
 {
-   DISPATCH(Rectfv, (v1, v2), (";\n"));
+   DISPATCH(Rectfv, (v1, v2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Recti)(GLint x1, GLint y1, GLint x2, GLint y2)
 {
-   DISPATCH(Recti, (x1, y1, x2, y2), (";\n"));
+   DISPATCH(Recti, (x1, y1, x2, y2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rectiv)(const GLint *v1, const GLint *v2)
 {
-   DISPATCH(Rectiv, (v1, v2), (";\n"));
+   DISPATCH(Rectiv, (v1, v2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rects)(GLshort x1, GLshort y1, GLshort x2, GLshort y2)
 {
-   DISPATCH(Rects, (x1, y1, x2, y2), (";\n"));
+   DISPATCH(Rects, (x1, y1, x2, y2), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rectsv)(const GLshort *v1, const GLshort *v2)
 {
-   DISPATCH(Rectsv, (v1, v2), (";\n"));
+   DISPATCH(Rectsv, (v1, v2), (F, ";"));
 }
 
 KEYWORD1 GLint KEYWORD2 NAME(RenderMode)(GLenum mode)
 {
-   RETURN_DISPATCH(RenderMode, (mode), ("glRenderMode(0x%x);\n", mode));
+   RETURN_DISPATCH(RenderMode, (mode), (F, "glRenderMode(0x%x);\n", mode));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rotated)(GLdouble angle, GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(Rotated, (angle, x, y, z), (";\n"));
+   DISPATCH(Rotated, (angle, x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Rotatef)(GLfloat angle, GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(Rotatef, (angle, x, y, z), ("glRotatef(%g, %g, %g, %g);\n", angle, x, y, z));
+   DISPATCH(Rotatef, (angle, x, y, z), (F, "glRotatef(%g, %g, %g, %g);\n", angle, x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(SelectBuffer)(GLsizei size, GLuint *buffer)
 {
-   DISPATCH(SelectBuffer, (size, buffer), (";\n"));
+   DISPATCH(SelectBuffer, (size, buffer), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Scaled)(GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(Scaled, (x, y, z), (";\n"));
+   DISPATCH(Scaled, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Scalef)(GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(Scalef, (x, y, z), ("glScalef(%g, %g, %g);\n", x, y, z));
+   DISPATCH(Scalef, (x, y, z), (F, "glScalef(%g, %g, %g);\n", x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Scissor)(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(Scissor, (x, y, width, height), ("glScissor(%d, %d, %d, %d);\n", x, y, width, height));
+   DISPATCH(Scissor, (x, y, width, height), (F, "glScissor(%d, %d, %d, %d);\n", x, y, width, height));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ShadeModel)(GLenum mode)
 {
-   DISPATCH(ShadeModel, (mode), ("glShadeModel(0x%x);\n", mode));
+   DISPATCH(ShadeModel, (mode), (F, "glShadeModel(0x%x);\n", mode));
 }
 
 KEYWORD1 void KEYWORD2 NAME(StencilFunc)(GLenum func, GLint ref, GLuint mask)
 {
-   DISPATCH(StencilFunc, (func, ref, mask), (";\n"));
+   DISPATCH(StencilFunc, (func, ref, mask), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(StencilMask)(GLuint mask)
 {
-   DISPATCH(StencilMask, (mask), (";\n"));
+   DISPATCH(StencilMask, (mask), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(StencilOp)(GLenum fail, GLenum zfail, GLenum zpass)
 {
-   DISPATCH(StencilOp, (fail, zfail, zpass), (";\n"));
+   DISPATCH(StencilOp, (fail, zfail, zpass), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1d)(GLdouble s)
 {
-   DISPATCH(TexCoord1d, (s), (";\n"));
+   DISPATCH(TexCoord1d, (s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1f)(GLfloat s)
 {
-   DISPATCH(TexCoord1f, (s), (";\n"));
+   DISPATCH(TexCoord1f, (s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1i)(GLint s)
 {
-   DISPATCH(TexCoord1i, (s), (";\n"));
+   DISPATCH(TexCoord1i, (s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1s)(GLshort s)
 {
-   DISPATCH(TexCoord1s, (s), (";\n"));
+   DISPATCH(TexCoord1s, (s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2d)(GLdouble s, GLdouble t)
 {
-   DISPATCH(TexCoord2d, (s, t), (";\n"));
+   DISPATCH(TexCoord2d, (s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2f)(GLfloat s, GLfloat t)
 {
-   DISPATCH(TexCoord2f, (s, t), (";\n"));
+   DISPATCH(TexCoord2f, (s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2s)(GLshort s, GLshort t)
 {
-   DISPATCH(TexCoord2s, (s, t), (";\n"));
+   DISPATCH(TexCoord2s, (s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2i)(GLint s, GLint t)
 {
-   DISPATCH(TexCoord2i, (s, t), (";\n"));
+   DISPATCH(TexCoord2i, (s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3d)(GLdouble s, GLdouble t, GLdouble r)
 {
-   DISPATCH(TexCoord3d, (s, t, r), (";\n"));
+   DISPATCH(TexCoord3d, (s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3f)(GLfloat s, GLfloat t, GLfloat r)
 {
-   DISPATCH(TexCoord3f, (s, t, r), (";\n"));
+   DISPATCH(TexCoord3f, (s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3i)(GLint s, GLint t, GLint r)
 {
-   DISPATCH(TexCoord3i, (s, t, r), (";\n"));
+   DISPATCH(TexCoord3i, (s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3s)(GLshort s, GLshort t, GLshort r)
 {
-   DISPATCH(TexCoord3s, (s, t, r), (";\n"));
+   DISPATCH(TexCoord3s, (s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4d)(GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-   DISPATCH(TexCoord4d, (s, t, r, q), (";\n"));
+   DISPATCH(TexCoord4d, (s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4f)(GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-   DISPATCH(TexCoord4f, (s, t, r, q), (";\n"));
+   DISPATCH(TexCoord4f, (s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4i)(GLint s, GLint t, GLint r, GLint q)
 {
-   DISPATCH(TexCoord4i, (s, t, r, q), (";\n"));
+   DISPATCH(TexCoord4i, (s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4s)(GLshort s, GLshort t, GLshort r, GLshort q)
 {
-   DISPATCH(TexCoord4s, (s, t, r, q), (";\n"));
+   DISPATCH(TexCoord4s, (s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1dv)(const GLdouble *v)
 {
-   DISPATCH(TexCoord1dv, (v), (";\n"));
+   DISPATCH(TexCoord1dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1fv)(const GLfloat *v)
 {
-   DISPATCH(TexCoord1fv, (v), (";\n"));
+   DISPATCH(TexCoord1fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1iv)(const GLint *v)
 {
-   DISPATCH(TexCoord1iv, (v), (";\n"));
+   DISPATCH(TexCoord1iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord1sv)(const GLshort *v)
 {
-   DISPATCH(TexCoord1sv, (v), (";\n"));
+   DISPATCH(TexCoord1sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2dv)(const GLdouble *v)
 {
-   DISPATCH(TexCoord2dv, (v), (";\n"));
+   DISPATCH(TexCoord2dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2fv)(const GLfloat *v)
 {
-   DISPATCH(TexCoord2fv, (v), (";\n"));
+   DISPATCH(TexCoord2fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2iv)(const GLint *v)
 {
-   DISPATCH(TexCoord2iv, (v), (";\n"));
+   DISPATCH(TexCoord2iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord2sv)(const GLshort *v)
 {
-   DISPATCH(TexCoord2sv, (v), (";\n"));
+   DISPATCH(TexCoord2sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3dv)(const GLdouble *v)
 {
-   DISPATCH(TexCoord3dv, (v), (";\n"));
+   DISPATCH(TexCoord3dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3fv)(const GLfloat *v)
 {
-   DISPATCH(TexCoord3fv, (v), (";\n"));
+   DISPATCH(TexCoord3fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3iv)(const GLint *v)
 {
-   DISPATCH(TexCoord3iv, (v), (";\n"));
+   DISPATCH(TexCoord3iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord3sv)(const GLshort *v)
 {
-   DISPATCH(TexCoord3sv, (v), (";\n"));
+   DISPATCH(TexCoord3sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4dv)(const GLdouble *v)
 {
-   DISPATCH(TexCoord4dv, (v), (";\n"));
+   DISPATCH(TexCoord4dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4fv)(const GLfloat *v)
 {
-   DISPATCH(TexCoord4fv, (v), (";\n"));
+   DISPATCH(TexCoord4fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4iv)(const GLint *v)
 {
-   DISPATCH(TexCoord4iv, (v), (";\n"));
+   DISPATCH(TexCoord4iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoord4sv)(const GLshort *v)
 {
-   DISPATCH(TexCoord4sv, (v), (";\n"));
+   DISPATCH(TexCoord4sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexGend)(GLenum coord, GLenum pname, GLdouble param)
 {
-   DISPATCH(TexGend, (coord, pname, param), (";\n"));
+   DISPATCH(TexGend, (coord, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexGendv)(GLenum coord, GLenum pname, const GLdouble *params)
 {
-   DISPATCH(TexGendv, (coord, pname, params), (";\n"));
+   DISPATCH(TexGendv, (coord, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexGenf)(GLenum coord, GLenum pname, GLfloat param)
 {
-   DISPATCH(TexGenf, (coord, pname, param), (";\n"));
+   DISPATCH(TexGenf, (coord, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexGenfv)(GLenum coord, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(TexGenfv, (coord, pname, params), (";\n"));
+   DISPATCH(TexGenfv, (coord, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexGeni)(GLenum coord, GLenum pname, GLint param)
 {
-   DISPATCH(TexGeni, (coord, pname, param), (";\n"));
+   DISPATCH(TexGeni, (coord, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexGeniv)(GLenum coord, GLenum pname, const GLint *params)
 {
-   DISPATCH(TexGeniv, (coord, pname, params), (";\n"));
+   DISPATCH(TexGeniv, (coord, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexEnvf)(GLenum target, GLenum pname, GLfloat param)
 {
-   DISPATCH(TexEnvf, (target, pname, param), (";\n"));
+   DISPATCH(TexEnvf, (target, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexEnvfv)(GLenum target, GLenum pname, const GLfloat *param)
 {
-   DISPATCH(TexEnvfv, (target, pname, param), (";\n"));
+   DISPATCH(TexEnvfv, (target, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexEnvi)(GLenum target, GLenum pname, GLint param)
 {
-   DISPATCH(TexEnvi, (target, pname, param), (";\n"));
+   DISPATCH(TexEnvi, (target, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexEnviv)(GLenum target, GLenum pname, const GLint *param)
 {
-   DISPATCH(TexEnviv, (target, pname, param), (";\n"));
+   DISPATCH(TexEnviv, (target, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexImage1D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexImage1D, (target, level, internalformat, width, border, format, type, pixels), (";\n"));
+   DISPATCH(TexImage1D, (target, level, internalformat, width, border, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexImage2D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexImage2D, (target, level, internalformat, width, height, border, format, type, pixels), (";\n"));
+   DISPATCH(TexImage2D, (target, level, internalformat, width, height, border, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexParameterf)(GLenum target, GLenum pname, GLfloat param)
 {
-   DISPATCH(TexParameterf, (target, pname, param), (";\n"));
+   DISPATCH(TexParameterf, (target, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexParameterfv)(GLenum target, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(TexParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(TexParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexParameteri)(GLenum target, GLenum pname, GLint param)
 {
-   DISPATCH(TexParameteri, (target, pname, param), (";\n"));
+   DISPATCH(TexParameteri, (target, pname, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexParameteriv)(GLenum target, GLenum pname, const GLint *params)
 {
-   DISPATCH(TexParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(TexParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Translated)(GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(Translated, (x, y, z), (";\n"));
+   DISPATCH(Translated, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Translatef)(GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(Translatef, (x, y, z), ("glTranslatef(%g, %g, %g);\n", x, y, z));
+   DISPATCH(Translatef, (x, y, z), (F, "glTranslatef(%g, %g, %g);\n", x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2d)(GLdouble x, GLdouble y)
 {
-   DISPATCH(Vertex2d, (x, y), (";\n"));
+   DISPATCH(Vertex2d, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2dv)(const GLdouble *v)
 {
-   DISPATCH(Vertex2dv, (v), (";\n"));
+   DISPATCH(Vertex2dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2f)(GLfloat x, GLfloat y)
 {
-   DISPATCH(Vertex2f, (x, y), (";\n"));
+   DISPATCH(Vertex2f, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2fv)(const GLfloat *v)
 {
-   DISPATCH(Vertex2fv, (v), (";\n"));
+   DISPATCH(Vertex2fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2i)(GLint x, GLint y)
 {
-   DISPATCH(Vertex2i, (x, y), (";\n"));
+   DISPATCH(Vertex2i, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2iv)(const GLint *v)
 {
-   DISPATCH(Vertex2iv, (v), (";\n"));
+   DISPATCH(Vertex2iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2s)(GLshort x, GLshort y)
 {
-   DISPATCH(Vertex2s, (x, y), (";\n"));
+   DISPATCH(Vertex2s, (x, y), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex2sv)(const GLshort *v)
 {
-   DISPATCH(Vertex2sv, (v), (";\n"));
+   DISPATCH(Vertex2sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3d)(GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(Vertex3d, (x, y, z), (";\n"));
+   DISPATCH(Vertex3d, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3dv)(const GLdouble *v)
 {
-   DISPATCH(Vertex3dv, (v), (";\n"));
+   DISPATCH(Vertex3dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3f)(GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(Vertex3f, (x, y, z), ("glVertex3f(%g, %g, %g);\n", x, y, z));
+   DISPATCH(Vertex3f, (x, y, z), (F, "glVertex3f(%g, %g, %g);\n", x, y, z));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3fv)(const GLfloat *v)
 {
-   DISPATCH(Vertex3fv, (v), (";\n"));
+   DISPATCH(Vertex3fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3i)(GLint x, GLint y, GLint z)
 {
-   DISPATCH(Vertex3i, (x, y, z), (";\n"));
+   DISPATCH(Vertex3i, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3iv)(const GLint *v)
 {
-   DISPATCH(Vertex3iv, (v), (";\n"));
+   DISPATCH(Vertex3iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3s)(GLshort x, GLshort y, GLshort z)
 {
-   DISPATCH(Vertex3s, (x, y, z), (";\n"));
+   DISPATCH(Vertex3s, (x, y, z), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex3sv)(const GLshort *v)
 {
-   DISPATCH(Vertex3sv, (v), (";\n"));
+   DISPATCH(Vertex3sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4d)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-   DISPATCH(Vertex4d, (x, y, z, w), (";\n"));
+   DISPATCH(Vertex4d, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4dv)(const GLdouble *v)
 {
-   DISPATCH(Vertex4dv, (v), (";\n"));
+   DISPATCH(Vertex4dv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4f)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   DISPATCH(Vertex4f, (x, y, z, w), (";\n"));
+   DISPATCH(Vertex4f, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4fv)(const GLfloat *v)
 {
-   DISPATCH(Vertex4fv, (v), (";\n"));
+   DISPATCH(Vertex4fv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4i)(GLint x, GLint y, GLint z, GLint w)
 {
-   DISPATCH(Vertex4i, (x, y, z, w), (";\n"));
+   DISPATCH(Vertex4i, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4iv)(const GLint *v)
 {
-   DISPATCH(Vertex4iv, (v), (";\n"));
+   DISPATCH(Vertex4iv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4s)(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-   DISPATCH(Vertex4s, (x, y, z, w), (";\n"));
+   DISPATCH(Vertex4s, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Vertex4sv)(const GLshort *v)
 {
-   DISPATCH(Vertex4sv, (v), (";\n"));
+   DISPATCH(Vertex4sv, (v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Viewport)(GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(Viewport, (x, y, width, height), (";\n"));
+   DISPATCH(Viewport, (x, y, width, height), (F, ";"));
 }
 
 
@@ -1629,147 +1629,147 @@ KEYWORD1 void KEYWORD2 NAME(Viewport)(GLint x, GLint y, GLsizei width, GLsizei h
 
 KEYWORD1 GLboolean KEYWORD2 NAME(AreTexturesResident)(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-   RETURN_DISPATCH(AreTexturesResident, (n, textures, residences), ("glAreTexturesResident(%d, %p, %p);\n", n, textures, residences));
+   RETURN_DISPATCH(AreTexturesResident, (n, textures, residences), (F, "glAreTexturesResident(%d, %p, %p);\n", n, textures, residences));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ArrayElement)(GLint i)
 {
-   DISPATCH(ArrayElement, (i), (";\n"));
+   DISPATCH(ArrayElement, (i), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BindTexture)(GLenum target, GLuint texture)
 {
-   DISPATCH(BindTexture, (target, texture), (";\n"));
+   DISPATCH(BindTexture, (target, texture), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 {
-   DISPATCH(ColorPointer, (size, type, stride, ptr), (";\n"));
+   DISPATCH(ColorPointer, (size, type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexImage1D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-   DISPATCH(CopyTexImage1D, (target, level, internalformat, x, y, width, border), (";\n"));
+   DISPATCH(CopyTexImage1D, (target, level, internalformat, x, y, width, border), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexImage2D)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-   DISPATCH(CopyTexImage2D, (target, level, internalformat, x, y, width, height, border), (";\n"));
+   DISPATCH(CopyTexImage2D, (target, level, internalformat, x, y, width, height, border), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-   DISPATCH(CopyTexSubImage1D, (target, level, xoffset, x, y, width), (";\n"));
+   DISPATCH(CopyTexSubImage1D, (target, level, xoffset, x, y, width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(CopyTexSubImage2D, (target, level, xoffset, yoffset, x, y, width, height), (";\n"));
+   DISPATCH(CopyTexSubImage2D, (target, level, xoffset, yoffset, x, y, width, height), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DeleteTextures)(GLsizei n, const GLuint *textures)
 {
-   DISPATCH(DeleteTextures, (n, textures), (";\n"));
+   DISPATCH(DeleteTextures, (n, textures), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DisableClientState)(GLenum cap)
 {
-   DISPATCH(DisableClientState, (cap), (";\n"));
+   DISPATCH(DisableClientState, (cap), (F, "glDisableClientState(%x);", cap));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DrawArrays)(GLenum mode, GLint first, GLsizei count)
 {
-   DISPATCH(DrawArrays, (mode, first, count), (";\n"));
+   DISPATCH(DrawArrays, (mode, first, count), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EdgeFlagPointer)(GLsizei stride, const GLvoid *ptr)
 {
-   DISPATCH(EdgeFlagPointer, (stride, ptr), (";\n"));
+   DISPATCH(EdgeFlagPointer, (stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EnableClientState)(GLenum cap)
 {
-   DISPATCH(EnableClientState, (cap), (";\n"));
+   DISPATCH(EnableClientState, (cap), (F, "glEnableClientState(%x)", cap));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GenTextures)(GLsizei n, GLuint *textures)
 {
-   DISPATCH(GenTextures, (n, textures), (";\n"));
+   DISPATCH(GenTextures, (n, textures), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetPointerv)(GLenum pname, GLvoid **params)
 {
-   DISPATCH(GetPointerv, (pname, params), (";\n"));
+   DISPATCH(GetPointerv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(IndexPointer)(GLenum type, GLsizei stride, const GLvoid *ptr)
 {
-   DISPATCH(IndexPointer, (type, stride, ptr), (";\n"));
+   DISPATCH(IndexPointer, (type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexub)(GLubyte c)
 {
-   DISPATCH(Indexub, (c), (";\n"));
+   DISPATCH(Indexub, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Indexubv)(const GLubyte *c)
 {
-   DISPATCH(Indexubv, (c), (";\n"));
+   DISPATCH(Indexubv, (c), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(InterleavedArrays)(GLenum format, GLsizei stride, const GLvoid *pointer)
 {
-   DISPATCH(InterleavedArrays, (format, stride, pointer), (";\n"));
+   DISPATCH(InterleavedArrays, (format, stride, pointer), (F, ";"));
 }
 
 KEYWORD1 GLboolean KEYWORD2 NAME(IsTexture)(GLuint texture)
 {
-   RETURN_DISPATCH(IsTexture, (texture), ("glIsTexture(%u);\n", texture));
+   RETURN_DISPATCH(IsTexture, (texture), (F, "glIsTexture(%u);\n", texture));
 }
 
 KEYWORD1 void KEYWORD2 NAME(NormalPointer)(GLenum type, GLsizei stride, const GLvoid *ptr)
 {
-   DISPATCH(NormalPointer, (type, stride, ptr), (";\n"));
+   DISPATCH(NormalPointer, (type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PolygonOffset)(GLfloat factor, GLfloat units)
 {
-   DISPATCH(PolygonOffset, (factor, units), (";\n"));
+   DISPATCH(PolygonOffset, (factor, units), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PopClientAttrib)(void)
 {
-   DISPATCH(PopClientAttrib, (), (";\n"));
+   DISPATCH(PopClientAttrib, (), (F, "glPopClientAttrib();"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PrioritizeTextures)(GLsizei n, const GLuint *textures, const GLclampf *priorities)
 {
-   DISPATCH(PrioritizeTextures, (n, textures, priorities), (";\n"));
+   DISPATCH(PrioritizeTextures, (n, textures, priorities), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PushClientAttrib)(GLbitfield mask)
 {
-   DISPATCH(PushClientAttrib, (mask), (";\n"));
+   DISPATCH(PushClientAttrib, (mask), (F, "glPushClientAttrib(%x)", mask));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoordPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 {
-   DISPATCH(TexCoordPointer, (size, type, stride, ptr), (";\n"));
+   DISPATCH(TexCoordPointer, (size, type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexSubImage1D)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexSubImage1D, (target, level, xoffset, width, format, type, pixels), (";\n"));
+   DISPATCH(TexSubImage1D, (target, level, xoffset, width, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexSubImage2D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexSubImage2D, (target, level, xoffset, yoffset, width, height, format, type, pixels), (";\n"));
+   DISPATCH(TexSubImage2D, (target, level, xoffset, yoffset, width, height, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(VertexPointer)(GLint size, GLenum type, GLsizei stride, const GLvoid *ptr)
 {
-   DISPATCH(VertexPointer, (size, type, stride, ptr), (";\n"));
+   DISPATCH(VertexPointer, (size, type, stride, ptr), (F, ";"));
 }
 
 
@@ -1779,22 +1779,22 @@ KEYWORD1 void KEYWORD2 NAME(VertexPointer)(GLint size, GLenum type, GLsizei stri
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(CopyTexSubImage3D, (target, level, xoffset, yoffset, zoffset, x, y, width, height), (";\n"));
+   DISPATCH(CopyTexSubImage3D, (target, level, xoffset, yoffset, zoffset, x, y, width, height), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DrawRangeElements)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices)
 {
-   DISPATCH(DrawRangeElements, (mode, start, end, count, type, indices), (";\n"));
+   DISPATCH(DrawRangeElements, (mode, start, end, count, type, indices), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexImage3D)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexImage3D, (target, level, internalformat, width, height, depth, border, format, type, pixels), (";\n"));
+   DISPATCH(TexImage3D, (target, level, internalformat, width, height, depth, border, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexSubImage3D)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexSubImage3D, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels), (";\n"));
+   DISPATCH(TexSubImage3D, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels), (F, ";"));
 }
 
 
@@ -1803,172 +1803,172 @@ KEYWORD1 void KEYWORD2 NAME(TexSubImage3D)(GLenum target, GLint level, GLint xof
 
 KEYWORD1 void KEYWORD2 NAME(BlendColor)(GLclampf r, GLclampf g, GLclampf b, GLclampf a)
 {
-   DISPATCH(BlendColor, (r, g, b, a), (";\n"));
+   DISPATCH(BlendColor, (r, g, b, a), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BlendEquation)(GLenum mode)
 {
-   DISPATCH(BlendEquation, (mode), (";\n"));
+   DISPATCH(BlendEquation, (mode), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorSubTable)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
 {
-   DISPATCH(ColorSubTable, (target, start, count, format, type, data), (";\n"));
+   DISPATCH(ColorSubTable, (target, start, count, format, type, data), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorTable)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-   DISPATCH(ColorTable, (target, internalformat, width, format, type, table), (";\n"));
+   DISPATCH(ColorTable, (target, internalformat, width, format, type, table), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorTableParameterfv)(GLenum target, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(ColorTableParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(ColorTableParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorTableParameteriv)(GLenum target, GLenum pname, const GLint *params)
 {
-   DISPATCH(ColorTableParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(ColorTableParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter1D)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-   DISPATCH(ConvolutionFilter1D, (target, internalformat, width, format, type, image), (";\n"));
+   DISPATCH(ConvolutionFilter1D, (target, internalformat, width, format, type, image), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-   DISPATCH(ConvolutionFilter2D, (target, internalformat, width, height, format, type, image), (";\n"));
+   DISPATCH(ConvolutionFilter2D, (target, internalformat, width, height, format, type, image), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterf)(GLenum target, GLenum pname, GLfloat params)
 {
-   DISPATCH(ConvolutionParameterf, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameterf, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterfv)(GLenum target, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(ConvolutionParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameteri)(GLenum target, GLenum pname, GLint params)
 {
-   DISPATCH(ConvolutionParameteri, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameteri, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameteriv)(GLenum target, GLenum pname, const GLint *params)
 {
-   DISPATCH(ConvolutionParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyColorSubTable)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
 {
-   DISPATCH(CopyColorSubTable, (target, start, x, y, width), (";\n"));
+   DISPATCH(CopyColorSubTable, (target, start, x, y, width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyColorTable)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-   DISPATCH(CopyColorTable, (target, internalformat, x, y, width), (";\n"));
+   DISPATCH(CopyColorTable, (target, internalformat, x, y, width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter1D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-   DISPATCH(CopyConvolutionFilter1D, (target, internalformat, x, y, width), (";\n"));
+   DISPATCH(CopyConvolutionFilter1D, (target, internalformat, x, y, width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter2D)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(CopyConvolutionFilter2D, (target, internalformat, x, y, width, height), (";\n"));
+   DISPATCH(CopyConvolutionFilter2D, (target, internalformat, x, y, width, height), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTable)(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-   DISPATCH(GetColorTable, (target, format, type, table), (";\n"));
+   DISPATCH(GetColorTable, (target, format, type, table), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterfv)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetColorTableParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(GetColorTableParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTableParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetColorTableParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(GetColorTableParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetConvolutionFilter)(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-   DISPATCH(GetConvolutionFilter, (target, format, type, image), (";\n"));
+   DISPATCH(GetConvolutionFilter, (target, format, type, image), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameterfv)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetConvolutionParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(GetConvolutionParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetConvolutionParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(GetConvolutionParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetHistogram)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-   DISPATCH(GetHistogram, (target, reset, format, type, values), (";\n"));
+   DISPATCH(GetHistogram, (target, reset, format, type, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetHistogramParameterfv)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetHistogramParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(GetHistogramParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetHistogramParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetHistogramParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(GetHistogramParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMinmax)(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values)
 {
-   DISPATCH(GetMinmax, (target, reset, format, types, values), (";\n"));
+   DISPATCH(GetMinmax, (target, reset, format, types, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameterfv)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetMinmaxParameterfv, (target, pname, params), (";\n"));
+   DISPATCH(GetMinmaxParameterfv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameteriv)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetMinmaxParameteriv, (target, pname, params), (";\n"));
+   DISPATCH(GetMinmaxParameteriv, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetSeparableFilter)(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-   DISPATCH(GetSeparableFilter, (target, format, type, row, column, span), (";\n"));
+   DISPATCH(GetSeparableFilter, (target, format, type, row, column, span), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Histogram)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-   DISPATCH(Histogram, (target, width, internalformat, sink), (";\n"));
+   DISPATCH(Histogram, (target, width, internalformat, sink), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(Minmax)(GLenum target, GLenum internalformat, GLboolean sink)
 {
-   DISPATCH(Minmax, (target, internalformat, sink), (";\n"));
+   DISPATCH(Minmax, (target, internalformat, sink), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ResetMinmax)(GLenum target)
 {
-   DISPATCH(ResetMinmax, (target), (";\n"));
+   DISPATCH(ResetMinmax, (target), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ResetHistogram)(GLenum target)
 {
-   DISPATCH(ResetHistogram, (target), (";\n"));
+   DISPATCH(ResetHistogram, (target), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(SeparableFilter2D)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-   DISPATCH(SeparableFilter2D, (target, internalformat, width, height, format, type, row, column), (";\n"));
+   DISPATCH(SeparableFilter2D, (target, internalformat, width, height, format, type, row, column), (F, ";"));
 }
 
 
@@ -1977,172 +1977,172 @@ KEYWORD1 void KEYWORD2 NAME(SeparableFilter2D)(GLenum target, GLenum internalfor
 
 KEYWORD1 void KEYWORD2 NAME(ActiveTextureARB)(GLenum texture)
 {
-   DISPATCH(ActiveTextureARB, (texture), (";\n"));
+   DISPATCH(ActiveTextureARB, (texture), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ClientActiveTextureARB)(GLenum texture)
 {
-   DISPATCH(ClientActiveTextureARB, (texture), (";\n"));
+   DISPATCH(ClientActiveTextureARB, (texture), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dARB)(GLenum target, GLdouble s)
 {
-   DISPATCH(MultiTexCoord1dARB, (target, s), (";\n"));
+   DISPATCH(MultiTexCoord1dARB, (target, s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1dvARB)(GLenum target, const GLdouble *v)
 {
-   DISPATCH(MultiTexCoord1dvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord1dvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fARB)(GLenum target, GLfloat s)
 {
-   DISPATCH(MultiTexCoord1fARB, (target, s), (";\n"));
+   DISPATCH(MultiTexCoord1fARB, (target, s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1fvARB)(GLenum target, const GLfloat *v)
 {
-   DISPATCH(MultiTexCoord1fvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord1fvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1iARB)(GLenum target, GLint s)
 {
-   DISPATCH(MultiTexCoord1iARB, (target, s), (";\n"));
+   DISPATCH(MultiTexCoord1iARB, (target, s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1ivARB)(GLenum target, const GLint *v)
 {
-   DISPATCH(MultiTexCoord1ivARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord1ivARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1sARB)(GLenum target, GLshort s)
 {
-   DISPATCH(MultiTexCoord1sARB, (target, s), (";\n"));
+   DISPATCH(MultiTexCoord1sARB, (target, s), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord1svARB)(GLenum target, const GLshort *v)
 {
-   DISPATCH(MultiTexCoord1svARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord1svARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dARB)(GLenum target, GLdouble s, GLdouble t)
 {
-   DISPATCH(MultiTexCoord2dARB, (target, s, t), (";\n"));
+   DISPATCH(MultiTexCoord2dARB, (target, s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2dvARB)(GLenum target, const GLdouble *v)
 {
-   DISPATCH(MultiTexCoord2dvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord2dvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fARB)(GLenum target, GLfloat s, GLfloat t)
 {
-   DISPATCH(MultiTexCoord2fARB, (target, s, t), (";\n"));
+   DISPATCH(MultiTexCoord2fARB, (target, s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2fvARB)(GLenum target, const GLfloat *v)
 {
-   DISPATCH(MultiTexCoord2fvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord2fvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2iARB)(GLenum target, GLint s, GLint t)
 {
-   DISPATCH(MultiTexCoord2iARB, (target, s, t), (";\n"));
+   DISPATCH(MultiTexCoord2iARB, (target, s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2ivARB)(GLenum target, const GLint *v)
 {
-   DISPATCH(MultiTexCoord2ivARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord2ivARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2sARB)(GLenum target, GLshort s, GLshort t)
 {
-   DISPATCH(MultiTexCoord2sARB, (target, s, t), (";\n"));
+   DISPATCH(MultiTexCoord2sARB, (target, s, t), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord2svARB)(GLenum target, const GLshort *v)
 {
-   DISPATCH(MultiTexCoord2svARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord2svARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r)
 {
-   DISPATCH(MultiTexCoord3dARB, (target, s, t, r), (";\n"));
+   DISPATCH(MultiTexCoord3dARB, (target, s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3dvARB)(GLenum target, const GLdouble *v)
 {
-   DISPATCH(MultiTexCoord3dvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord3dvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r)
 {
-   DISPATCH(MultiTexCoord3fARB, (target, s, t, r), (";\n"));
+   DISPATCH(MultiTexCoord3fARB, (target, s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3fvARB)(GLenum target, const GLfloat *v)
 {
-   DISPATCH(MultiTexCoord3fvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord3fvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3iARB)(GLenum target, GLint s, GLint t, GLint r)
 {
-   DISPATCH(MultiTexCoord3iARB, (target, s, t, r), (";\n"));
+   DISPATCH(MultiTexCoord3iARB, (target, s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3ivARB)(GLenum target, const GLint *v)
 {
-   DISPATCH(MultiTexCoord3ivARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord3ivARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3sARB)(GLenum target, GLshort s, GLshort t, GLshort r)
 {
-   DISPATCH(MultiTexCoord3sARB, (target, s, t, r), (";\n"));
+   DISPATCH(MultiTexCoord3sARB, (target, s, t, r), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord3svARB)(GLenum target, const GLshort *v)
 {
-   DISPATCH(MultiTexCoord3svARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord3svARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dARB)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q)
 {
-   DISPATCH(MultiTexCoord4dARB, (target, s, t, r, q), (";\n"));
+   DISPATCH(MultiTexCoord4dARB, (target, s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4dvARB)(GLenum target, const GLdouble *v)
 {
-   DISPATCH(MultiTexCoord4dvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord4dvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fARB)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q)
 {
-   DISPATCH(MultiTexCoord4fARB, (target, s, t, r, q), (";\n"));
+   DISPATCH(MultiTexCoord4fARB, (target, s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4fvARB)(GLenum target, const GLfloat *v)
 {
-   DISPATCH(MultiTexCoord4fvARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord4fvARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4iARB)(GLenum target, GLint s, GLint t, GLint r, GLint q)
 {
-   DISPATCH(MultiTexCoord4iARB, (target, s, t, r, q), (";\n"));
+   DISPATCH(MultiTexCoord4iARB, (target, s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4ivARB)(GLenum target, const GLint *v)
 {
-   DISPATCH(MultiTexCoord4ivARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord4ivARB, (target, v), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4sARB)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q)
 {
-   DISPATCH(MultiTexCoord4sARB, (target, s, t, r, q), (";\n"));
+   DISPATCH(MultiTexCoord4sARB, (target, s, t, r, q), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4svARB)(GLenum target, const GLshort *v)
 {
-   DISPATCH(MultiTexCoord4svARB, (target, v), (";\n"));
+   DISPATCH(MultiTexCoord4svARB, (target, v), (F, ";"));
 }
 
 
@@ -2155,7 +2155,7 @@ KEYWORD1 void KEYWORD2 NAME(MultiTexCoord4svARB)(GLenum target, const GLshort *v
 /* 2. GL_EXT_blend_color */
 KEYWORD1 void KEYWORD2 NAME(BlendColorEXT)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha)
 {
-   DISPATCH(BlendColorEXT, (red, green, blue, alpha), (";\n"));
+   DISPATCH(BlendColorEXT, (red, green, blue, alpha), (F, ";"));
 }
 
 
@@ -2163,26 +2163,26 @@ KEYWORD1 void KEYWORD2 NAME(BlendColorEXT)(GLclampf red, GLclampf green, GLclamp
 /* 3. GL_EXT_polygon_offset */
 KEYWORD1 void KEYWORD2 NAME(PolygonOffsetEXT)(GLfloat factor, GLfloat bias)
 {
-   DISPATCH(PolygonOffsetEXT, (factor, bias), (";\n"));
+   DISPATCH(PolygonOffsetEXT, (factor, bias), (F, ";"));
 }
 
 
 
 /* 6. GL_EXT_texture3D */
 
-KEYWORD1 void KEYWORD2 NAME(TexImage3DEXT)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
+KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(TexImage3D, (target, level, internalFormat, width, height, depth, border, format, type, pixels), (";\n"));
+   DISPATCH(CopyTexSubImage3DEXT, (target, level, xoffset, yoffset, zoffset, x, y, width, height), (F, ";"));
 }
 
-KEYWORD1 void KEYWORD2 NAME(TexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
+KEYWORD1 void KEYWORD2 NAME(TexImage3DEXT)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexSubImage3D, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels), (";\n"));
+   DISPATCH(TexImage3DEXT, (target, level, internalFormat, width, height, depth, border, format, type, pixels), (F, ";"));
 }
 
-KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height)
+KEYWORD1 void KEYWORD2 NAME(TexSubImage3DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(CopyTexSubImage3D, (target, level, xoffset, yoffset, zoffset, x, y, width, height), (";\n"));
+   DISPATCH(TexSubImage3DEXT, (target, level, xoffset, yoffset, zoffset, width, height, depth, format, type, pixels), (F, ";"));
 }
 
 
@@ -2191,12 +2191,12 @@ KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage3DEXT)(GLenum target, GLint level, GL
 
 KEYWORD1 void KEYWORD2 NAME(GetTexFilterFuncSGIS)(GLenum target, GLenum filter, GLsizei n, const GLfloat *weights)
 {
-   DISPATCH(GetTexFilterFuncSGIS, (target, filter, n, weights), (";\n"));
+   DISPATCH(GetTexFilterFuncSGIS, (target, filter, n, weights), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexFilterFuncSGIS)(GLenum target, GLenum filter, GLfloat *weights)
 {
-   DISPATCH(TexFilterFuncSGIS, (target, filter, weights), (";\n"));
+   DISPATCH(TexFilterFuncSGIS, (target, filter, weights), (F, ";"));
 }
 
 
@@ -2205,17 +2205,17 @@ KEYWORD1 void KEYWORD2 NAME(TexFilterFuncSGIS)(GLenum target, GLenum filter, GLf
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage1DEXT)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width)
 {
-   DISPATCH(CopyTexSubImage1DEXT, (target, level, xoffset, x, y, width), (";\n"));
+   DISPATCH(CopyTexSubImage1DEXT, (target, level, xoffset, x, y, width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexSubImage1DEXT)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexSubImage1DEXT, (target, level, xoffset, width, format, type, pixels), (";\n"));
+   DISPATCH(TexSubImage1DEXT, (target, level, xoffset, width, format, type, pixels), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexSubImage2DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels)
 {
-   DISPATCH(TexSubImage2DEXT, (target, level, xoffset, yoffset, width, height, format, type, pixels), (";\n"));
+   DISPATCH(TexSubImage2DEXT, (target, level, xoffset, yoffset, width, height, format, type, pixels), (F, ";"));
 }
 
 
@@ -2223,18 +2223,18 @@ KEYWORD1 void KEYWORD2 NAME(TexSubImage2DEXT)(GLenum target, GLint level, GLint
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexImage1DEXT)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border)
 {
-   DISPATCH(CopyTexImage1DEXT, (target, level, internalformat, x, y, width, border), (";\n"));
+   DISPATCH(CopyTexImage1DEXT, (target, level, internalformat, x, y, width, border), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexImage2DEXT)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border)
 {
-   DISPATCH(CopyTexImage2DEXT, (target, level, internalformat, x, y, width, height, border), (";\n"));
+   DISPATCH(CopyTexImage2DEXT, (target, level, internalformat, x, y, width, height, border), (F, ";"));
 }
 
 
 KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage2DEXT)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(CopyTexSubImage2DEXT, (target, level, xoffset, yoffset, x, y, width, height), (";\n"));
+   DISPATCH(CopyTexSubImage2DEXT, (target, level, xoffset, yoffset, x, y, width, height), (F, ";"));
 }
 
 
@@ -2242,52 +2242,52 @@ KEYWORD1 void KEYWORD2 NAME(CopyTexSubImage2DEXT)(GLenum target, GLint level, GL
 /* 11. GL_EXT_histogram */
 KEYWORD1 void KEYWORD2 NAME(GetHistogramEXT)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values)
 {
-   DISPATCH(GetHistogramEXT, (target, reset, format, type, values), (";\n"));
+   DISPATCH(GetHistogramEXT, (target, reset, format, type, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetHistogramParameterfvEXT)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetHistogramParameterfvEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetHistogramParameterfvEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetHistogramParameterivEXT)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetHistogramParameterivEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetHistogramParameterivEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMinmaxEXT)(GLenum target, GLboolean reset, GLenum format, GLenum types, GLvoid *values)
 {
-   DISPATCH(GetMinmaxEXT, (target, reset, format, types, values), (";\n"));
+   DISPATCH(GetMinmaxEXT, (target, reset, format, types, values), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameterfvEXT)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetMinmaxParameterfvEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetMinmaxParameterfvEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetMinmaxParameterivEXT)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetMinmaxParameterivEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetMinmaxParameterivEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(HistogramEXT)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink)
 {
-   DISPATCH(HistogramEXT, (target, width, internalformat, sink), (";\n"));
+   DISPATCH(HistogramEXT, (target, width, internalformat, sink), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MinmaxEXT)(GLenum target, GLenum internalformat, GLboolean sink)
 {
-   DISPATCH(MinmaxEXT, (target, internalformat, sink), (";\n"));
+   DISPATCH(MinmaxEXT, (target, internalformat, sink), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ResetHistogramEXT)(GLenum target)
 {
-   DISPATCH(ResetHistogramEXT, (target), (";\n"));
+   DISPATCH(ResetHistogramEXT, (target), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ResetMinmaxEXT)(GLenum target)
 {
-   DISPATCH(ResetMinmaxEXT, (target), (";\n"));
+   DISPATCH(ResetMinmaxEXT, (target), (F, ";"));
 }
 
 
@@ -2296,67 +2296,67 @@ KEYWORD1 void KEYWORD2 NAME(ResetMinmaxEXT)(GLenum target)
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter1DEXT)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image)
 {
-   DISPATCH(ConvolutionFilter1DEXT, (target, internalformat, width, format, type, image), (";\n"));
+   DISPATCH(ConvolutionFilter1DEXT, (target, internalformat, width, format, type, image), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionFilter2DEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image)
 {
-   DISPATCH(ConvolutionFilter2DEXT, (target, internalformat, width, height, format, type, image), (";\n"));
+   DISPATCH(ConvolutionFilter2DEXT, (target, internalformat, width, height, format, type, image), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterfEXT)(GLenum target, GLenum pname, GLfloat params)
 {
-   DISPATCH(ConvolutionParameterfEXT, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameterfEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterfvEXT)(GLenum target, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(ConvolutionParameterfvEXT, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameterfvEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameteriEXT)(GLenum target, GLenum pname, GLint params)
 {
-   DISPATCH(ConvolutionParameteriEXT, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameteriEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ConvolutionParameterivEXT)(GLenum target, GLenum pname, const GLint *params)
 {
-   DISPATCH(ConvolutionParameterivEXT, (target, pname, params), (";\n"));
+   DISPATCH(ConvolutionParameterivEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter1DEXT)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width)
 {
-   DISPATCH(CopyConvolutionFilter1DEXT, (target, internalformat, x, y, width), (";\n"));
+   DISPATCH(CopyConvolutionFilter1DEXT, (target, internalformat, x, y, width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyConvolutionFilter2DEXT)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   DISPATCH(CopyConvolutionFilter2DEXT, (target, internalformat, x, y, width, height), (";\n"));
+   DISPATCH(CopyConvolutionFilter2DEXT, (target, internalformat, x, y, width, height), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetConvolutionFilterEXT)(GLenum target, GLenum format, GLenum type, GLvoid *image)
 {
-   DISPATCH(GetConvolutionFilterEXT, (target, format, type, image), (";\n"));
+   DISPATCH(GetConvolutionFilterEXT, (target, format, type, image), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameterfvEXT)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetConvolutionParameterfvEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetConvolutionParameterfvEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetConvolutionParameterivEXT)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetConvolutionParameterivEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetConvolutionParameterivEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetSeparableFilterEXT)(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span)
 {
-   DISPATCH(GetSeparableFilterEXT, (target, format, type, row, column, span), (";\n"));
+   DISPATCH(GetSeparableFilterEXT, (target, format, type, row, column, span), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(SeparableFilter2DEXT)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column)
 {
-   DISPATCH(SeparableFilter2DEXT, (target, internalformat, width, height, format, type, row, column), (";\n"));
+   DISPATCH(SeparableFilter2DEXT, (target, internalformat, width, height, format, type, row, column), (F, ";"));
 }
 
 
@@ -2365,36 +2365,74 @@ KEYWORD1 void KEYWORD2 NAME(SeparableFilter2DEXT)(GLenum target, GLenum internal
 
 KEYWORD1 void KEYWORD2 NAME(ColorTableParameterfvSGI)(GLenum target, GLenum pname, const GLfloat *params)
 {
-   DISPATCH(ColorTableParameterfvSGI, (target, pname, params), (";\n"));
+   DISPATCH(ColorTableParameterfvSGI, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorTableParameterivSGI)(GLenum target, GLenum pname, const GLint *params)
 {
-   DISPATCH(ColorTableParameterivSGI, (target, pname, params), (";\n"));
+   DISPATCH(ColorTableParameterivSGI, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorTableSGI)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-   DISPATCH(ColorTableSGI, (target, internalformat, width, format, type, table), (";\n"));
+   DISPATCH(ColorTableSGI, (target, internalformat, width, format, type, table), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(CopyColorTableSGI)(GLenum target, GLenum internalFormat, GLint x, GLint y, GLsizei width)
 {
-   DISPATCH(CopyColorTableSGI, (target, internalFormat, x, y, width), (";\n"));
+   DISPATCH(CopyColorTableSGI, (target, internalFormat, x, y, width), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTableSGI)(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-   DISPATCH(GetColorTableSGI, (target, format, type, table), (";\n"));
+   DISPATCH(GetColorTableSGI, (target, format, type, table), (F, ";"));
 }
 KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterfvSGI)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetColorTableParameterfvSGI, (target, pname, params), (";\n"));
+   DISPATCH(GetColorTableParameterfvSGI, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterivSGI)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetColorTableParameterivSGI, (target, pname, params), (";\n"));
+   DISPATCH(GetColorTableParameterivSGI, (target, pname, params), (F, ";"));
+}
+
+
+
+/* 15. GL_SGIS_pixel_texture */
+
+KEYWORD1 void KEYWORD2 NAME(PixelTexGenParameterfSGIS)(GLenum target, GLfloat value)
+{
+   DISPATCH(PixelTexGenParameterfSGIS, (target, value), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(PixelTexGenParameteriSGIS)(GLenum target, GLint value)
+{
+   DISPATCH(PixelTexGenParameteriSGIS, (target, value), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelTexGenParameterfvSGIS)(GLenum target, GLfloat *value)
+{
+   DISPATCH(GetPixelTexGenParameterfvSGIS, (target, value), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetPixelTexGenParameterivSGIS)(GLenum target, GLint *value)
+{
+   DISPATCH(GetPixelTexGenParameterivSGIS, (target, value), (F, ";"));
+}
+
+
+
+/* 16. GL_SGIS_texture4D */
+
+KEYWORD1 void KEYWORD2 NAME(TexImage4DSGIS)(GLenum target, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLint border, GLenum format, GLenum type, const void *pixels)
+{
+   DISPATCH(TexImage4DSGIS, (target, level, internalFormat, width, height, depth, extent, border, format, type, pixels), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(TexSubImage4DSGIS)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei extent, GLenum format, GLenum type, const void *pixels)
+{
+   DISPATCH(TexSubImage4DSGIS, (target, level, xoffset, yoffset, zoffset, woffset, width, height, depth, extent, format, type, pixels), (F, ";"));
 }
 
 
@@ -2403,89 +2441,150 @@ KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterivSGI)(GLenum target, GLenum p
 
 KEYWORD1 void KEYWORD2 NAME(GenTexturesEXT)(GLsizei n, GLuint *textures)
 {
-   DISPATCH(GenTextures, (n, textures), (";\n"));
+   DISPATCH(GenTextures, (n, textures), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DeleteTexturesEXT)(GLsizei n, const GLuint *texture)
 {
-   DISPATCH(DeleteTextures, (n, texture), (";\n"));
+   DISPATCH(DeleteTextures, (n, texture), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(BindTextureEXT)(GLenum target, GLuint texture)
 {
-   DISPATCH(BindTexture, (target, texture), (";\n"));
+   DISPATCH(BindTexture, (target, texture), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PrioritizeTexturesEXT)(GLsizei n, const GLuint *textures, const GLclampf *priorities)
 {
-   DISPATCH(PrioritizeTextures, (n, textures, priorities), (";\n"));
+   DISPATCH(PrioritizeTextures, (n, textures, priorities), (F, ";"));
 }
 
 KEYWORD1 GLboolean KEYWORD2 NAME(AreTexturesResidentEXT)(GLsizei n, const GLuint *textures, GLboolean *residences)
 {
-   RETURN_DISPATCH(AreTexturesResident, (n, textures, residences), ("glAreTexturesResidentEXT(%d %p %p);\n", n, textures, residences));
+   RETURN_DISPATCH(AreTexturesResident, (n, textures, residences), (F, "glAreTexturesResidentEXT(%d %p %p);\n", n, textures, residences));
 }
 
 KEYWORD1 GLboolean KEYWORD2 NAME(IsTextureEXT)(GLuint texture)
 {
-   RETURN_DISPATCH(IsTexture, (texture), ("glIsTextureEXT(%u);\n", texture));
+   RETURN_DISPATCH(IsTexture, (texture), (F, "glIsTextureEXT(%u);\n", texture));
 }
 
 
 
-/* 37. GL_EXT_blend_minmax */
-KEYWORD1 void KEYWORD2 NAME(BlendEquationEXT)(GLenum mode)
+/* 21. GL_SGIS_detail_texture */
+
+KEYWORD1 void KEYWORD2 NAME(DetailTexFuncSGIS)(GLenum target, GLsizei n, const GLfloat *points)
+{
+   DISPATCH(DetailTexFuncSGIS, (target, n, points), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetDetailTexFuncSGIS)(GLenum target, GLfloat *points)
+{
+   DISPATCH(GetDetailTexFuncSGIS, (target, points), (F, ";"));
+}
+
+
+/* 22. GL_SGIS_sharpen_texture */
+
+KEYWORD1 void KEYWORD2 NAME(GetSharpenTexFuncSGIS)(GLenum target, GLfloat *points)
+{
+   DISPATCH(GetSharpenTexFuncSGIS, (target, points), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SharpenTexFuncSGIS)(GLenum target, GLsizei n, const GLfloat *points)
 {
-   DISPATCH(BlendEquationEXT, (mode), (";\n"));
+   DISPATCH(SharpenTexFuncSGIS, (target, n, points), (F, ";"));
 }
 
 
+/* 25. GL_SGIS_multisample */
+
+KEYWORD1 void KEYWORD2 NAME(SampleMaskSGIS)(GLclampf value, GLboolean invert)
+{
+   DISPATCH(SampleMaskSGIS, (value, invert), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SamplePatternSGIS)(GLenum pattern)
+{
+   DISPATCH(SamplePatternSGIS, (pattern), (F, ";"));
+}
+
 
 /* 30. GL_EXT_vertex_array */
 
 KEYWORD1 void KEYWORD2 NAME(VertexPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(VertexPointer, (size, type, stride, ptr), (";\n"));
+   DISPATCH(VertexPointer, (size, type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(NormalPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(NormalPointer, (type, stride, ptr), (";\n"));
+   DISPATCH(NormalPointer, (type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ColorPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(ColorPointer, (size, type, stride, ptr), (";\n"));
+   DISPATCH(ColorPointer, (size, type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(IndexPointerEXT)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(IndexPointer, (type, stride, ptr), (";\n"));
+   DISPATCH(IndexPointer, (type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(TexCoordPointerEXT)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *ptr)
 {
-   DISPATCH(ColorPointer, (size, type, stride, ptr), (";\n"));
+   DISPATCH(ColorPointer, (size, type, stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(EdgeFlagPointerEXT)(GLsizei stride, GLsizei count, const GLboolean *ptr)
 {
-   DISPATCH(EdgeFlagPointer, (stride, ptr), (";\n"));
+   DISPATCH(EdgeFlagPointer, (stride, ptr), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetPointervEXT)(GLenum pname, void **params)
 {
-   DISPATCH(GetPointerv, (pname, params), (";\n"));
+   DISPATCH(GetPointerv, (pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(ArrayElementEXT)(GLint i)
 {
-   DISPATCH(ArrayElement, (i), (";\n"));
+   DISPATCH(ArrayElement, (i), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(DrawArraysEXT)(GLenum mode, GLint first, GLsizei count)
 {
-   DISPATCH(DrawArrays, (mode, first, count), (";\n"));
+   DISPATCH(DrawArrays, (mode, first, count), (F, ";"));
+}
+
+
+/* 37. GL_EXT_blend_minmax */
+KEYWORD1 void KEYWORD2 NAME(BlendEquationEXT)(GLenum mode)
+{
+   DISPATCH(BlendEquationEXT, (mode), (F, ";"));
+}
+
+
+/* 52. GL_SGIX_sprite */
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameterfSGIX)(GLenum pname, GLfloat param)
+{
+   DISPATCH(SpriteParameterfSGIX, (pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameterfvSGIX)(GLenum pname, const GLfloat *param)
+{
+   DISPATCH(SpriteParameterfvSGIX, (pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameteriSGIX)(GLenum pname, GLint param)
+{
+   DISPATCH(SpriteParameteriSGIX, (pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(SpriteParameterivSGIX)(GLenum pname, const GLint *param)
+{
+   DISPATCH(SpriteParameterivSGIX, (pname, param), (F, ";"));
 }
 
 
@@ -2494,49 +2593,194 @@ KEYWORD1 void KEYWORD2 NAME(DrawArraysEXT)(GLenum mode, GLint first, GLsizei cou
 
 KEYWORD1 void KEYWORD2 NAME(PointParameterfEXT)(GLenum target, GLfloat param)
 {
-   DISPATCH(PointParameterfEXT, (target, param), (";\n"));
+   DISPATCH(PointParameterfEXT, (target, param), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(PointParameterfvEXT)(GLenum target, const GLfloat *param)
 {
-   DISPATCH(PointParameterfvEXT, (target, param), (";\n"));
+   DISPATCH(PointParameterfvEXT, (target, param), (F, ";"));
+}
+
+
+
+/* 55. GL_SGIX_instruments */
+KEYWORD1 GLint KEYWORD2 NAME(GetInstrumentsSGIX)(void)
+{
+   RETURN_DISPATCH(GetInstrumentsSGIX, (), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(InstrumentsBufferSGIX)(GLsizei size, GLint *buf)
+{
+   DISPATCH(InstrumentsBufferSGIX, (size, buf), (F, ";"));
+}
+
+KEYWORD1 GLint KEYWORD2 NAME(PollInstrumentsSGIX)(GLint *markerp)
+{
+   RETURN_DISPATCH(PollInstrumentsSGIX, (markerp), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ReadInstrumentsSGIX)(GLint marker)
+{
+   DISPATCH(ReadInstrumentsSGIX, (marker), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(StartInstrumentsSGIX)(void)
+{
+   DISPATCH(StartInstrumentsSGIX, (), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(StopInstrumentsSGIX)(GLint marker)
+{
+   DISPATCH(StopInstrumentsSGIX, (marker), (F, ";"));
+}
+
+
+
+/* 57. GL_SGIX_framezoom */
+KEYWORD1 void KEYWORD2 NAME(FrameZoomSGIX)(GLint factor)
+{
+   DISPATCH(FrameZoomSGIX, (factor), (F, ";"));
+}
+
+
+/* 60. GL_SGIX_reference_plane */
+KEYWORD1 void KEYWORD2 NAME(ReferencePlaneSGIX)(const GLdouble *plane)
+{
+   DISPATCH(ReferencePlaneSGIX, (plane), (F, ";"));
+}
+
+
+/* 61. GL_SGIX_flush_raster */
+KEYWORD1 void KEYWORD2 NAME(FlushRasterSGIX)(void)
+{
+   DISPATCH(FlushRasterSGIX, (), (F, ";"));
+}
+
+
+
+/* 66. GL_HP_image_transform */
+KEYWORD1 void KEYWORD2 NAME(GetImageTransformParameterfvHP)(GLenum target, GLenum pname, GLfloat *param)
+{
+   DISPATCH(GetImageTransformParameterfvHP, (target, pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(GetImageTransformParameterivHP)(GLenum target, GLenum pname, GLint *param)
+{
+   DISPATCH(GetImageTransformParameterivHP, (target, pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ImageTransformParameterfHP)(GLenum target, GLenum pname, const GLfloat param)
+{
+   DISPATCH(ImageTransformParameterfHP, (target, pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ImageTransformParameterfvHP)(GLenum target, GLenum pname, const GLfloat *param)
+{
+   DISPATCH(ImageTransformParameterfvHP, (target, pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ImageTransformParameteriHP)(GLenum target, GLenum pname, const GLint param)
+{
+   DISPATCH(ImageTransformParameteriHP, (target, pname, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ImageTransformParameterivHP)(GLenum target, GLenum pname, const GLint *param)
+{
+   DISPATCH(ImageTransformParameterivHP, (target, pname, param), (F, ";"));
+}
+
+
+/* 74. GL_EXT_color_subtable */
+KEYWORD1 void KEYWORD2 NAME(ColorSubTableEXT)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const void *data)
+{
+   DISPATCH(ColorSubTableEXT, (target, start, count, format, type, data), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CopyColorSubTableEXT)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width)
+{
+   DISPATCH(CopyColorSubTableEXT, (target, start, x, y, width), (F, ";"));
 }
 
 
+
 /* 77. GL_PGI_misc_hints */
 KEYWORD1 void KEYWORD2 NAME(HintPGI)(GLenum target, GLint mode)
 {
-   DISPATCH(HintPGI, (target, mode), (";\n"));
+   DISPATCH(HintPGI, (target, mode), (F, ";"));
 }
 
 
+
 /* 78. GL_EXT_paletted_texture */
 
 KEYWORD1 void KEYWORD2 NAME(ColorTableEXT)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table)
 {
-   DISPATCH(ColorTableEXT, (target, internalformat, width, format, type, table), (";\n"));
-}
-
-KEYWORD1 void KEYWORD2 NAME(ColorSubTableEXT)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data)
-{
-   DISPATCH(ColorSubTableEXT, (target, start, count, format, type, data), (";\n"));
+   DISPATCH(ColorTableEXT, (target, internalformat, width, format, type, table), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTableEXT)(GLenum target, GLenum format, GLenum type, GLvoid *table)
 {
-   DISPATCH(GetColorTableEXT, (target, format, type, table), (";\n"));
+   DISPATCH(GetColorTableEXT, (target, format, type, table), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterfvEXT)(GLenum target, GLenum pname, GLfloat *params)
 {
-   DISPATCH(GetColorTableParameterfvEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetColorTableParameterfvEXT, (target, pname, params), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterivEXT)(GLenum target, GLenum pname, GLint *params)
 {
-   DISPATCH(GetColorTableParameterivEXT, (target, pname, params), (";\n"));
+   DISPATCH(GetColorTableParameterivEXT, (target, pname, params), (F, ";"));
+}
+
+
+
+
+/* 80. GL_SGIX_list_priority */
+KEYWORD1 void KEYWORD2 NAME(GetListParameterfvSGIX)(GLuint list, GLenum name, GLfloat *param)
+{
+   DISPATCH(GetListParameterfvSGIX, (list, name, param), (F, ";"));
 }
 
+KEYWORD1 void KEYWORD2 NAME(GetListParameterivSGIX)(GLuint list, GLenum name, GLint *param)
+{
+   DISPATCH(GetListParameterivSGIX, (list, name, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameterfSGIX)(GLuint list, GLenum name, GLfloat param)
+{
+   DISPATCH(ListParameterfSGIX, (list, name, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameterfvSGIX)(GLuint list, GLenum name, const GLfloat *param)
+{
+   DISPATCH(ListParameterfvSGIX, (list, name, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameteriSGIX)(GLuint list, GLenum name, GLint param)
+{
+   DISPATCH(ListParameteriSGIX, (list, name, param), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(ListParameterivSGIX)(GLuint list, GLenum name, const GLint *param)
+{
+   DISPATCH(ListParameterivSGIX, (list, name, param), (F, ";"));
+}
+
+
+
+/* 94. GL_EXT_index_material */
+KEYWORD1 void KEYWORD2 NAME(IndexMaterialEXT)(GLenum face, GLenum mode)
+{
+   DISPATCH(IndexMaterialEXT, (face, mode), (F, ";"));
+}
+
+
+/* 95. GL_EXT_index_func */
+KEYWORD1 void KEYWORD2 NAME(IndexFuncEXT)(GLenum func, GLfloat ref)
+{
+   DISPATCH(IndexFuncEXT, (func, ref), (F, ";"));
+}
 
 
 
@@ -2544,12 +2788,24 @@ KEYWORD1 void KEYWORD2 NAME(GetColorTableParameterivEXT)(GLenum target, GLenum p
 
 KEYWORD1 void KEYWORD2 NAME(LockArraysEXT)(GLint first, GLsizei count)
 {
-   DISPATCH(LockArraysEXT, (first, count), (";\n"));
+   DISPATCH(LockArraysEXT, (first, count), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
 {
-   DISPATCH(UnlockArraysEXT, (), (";\n"));
+   DISPATCH(UnlockArraysEXT, (), (F, ";"));
+}
+
+
+/* 98. GL_EXT_cull_vertex */
+KEYWORD1 void KEYWORD2 NAME(CullParameterfvEXT)(GLenum pname, const GLfloat *params)
+{
+   DISPATCH(CullParameterfvEXT, (pname, params), (F, ";"));
+}
+
+KEYWORD1 void KEYWORD2 NAME(CullParameterdvEXT)(GLenum pname, const GLdouble *params)
+{
+   DISPATCH(CullParameterdvEXT, (pname, params), (F, ";"));
 }
 
 
@@ -2557,7 +2813,7 @@ KEYWORD1 void KEYWORD2 NAME(UnlockArraysEXT)(void)
 /* 173. GL_EXT/INGR_blend_func_separate */
 KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateINGR)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha)
 {
-   DISPATCH(BlendFuncSeparateINGR, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (";\n"));
+   DISPATCH(BlendFuncSeparateINGR, (sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha), (F, ";"));
 }
 
 
@@ -2566,122 +2822,122 @@ KEYWORD1 void KEYWORD2 NAME(BlendFuncSeparateINGR)(GLenum sfactorRGB, GLenum dfa
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2iMESA)(GLint x, GLint y)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2sMESA)(GLshort x, GLshort y)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2fMESA)(GLfloat x, GLfloat y)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2dMESA)(GLdouble x, GLdouble y)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2ivMESA)(const GLint *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2svMESA)(const GLshort *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2fvMESA)(const GLfloat *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos2dvMESA)(const GLdouble *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], 0, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3iMESA)(GLint x, GLint y, GLint z)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3sMESA)(GLshort x, GLshort y, GLshort z)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3fMESA)(GLfloat x, GLfloat y, GLfloat z)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3dMESA)(GLdouble x, GLdouble y, GLdouble z)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, 1), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3ivMESA)(const GLint *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3svMESA)(const GLshort *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3fvMESA)(const GLfloat *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos3dvMESA)(const GLdouble *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], 1.0), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4iMESA)(GLint x, GLint y, GLint z, GLint w)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, w), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4sMESA)(GLshort x, GLshort y, GLshort z, GLshort w)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, w), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4fMESA)(GLfloat x, GLfloat y, GLfloat z, GLfloat w)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, w), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4dMESA)(GLdouble x, GLdouble y, GLdouble z, GLdouble w)
 {
-   DISPATCH(WindowPos4fMESA, (x, y, z, w), (";\n"));
+   DISPATCH(WindowPos4fMESA, (x, y, z, w), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4ivMESA)(const GLint *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4svMESA)(const GLshort *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4fvMESA)(const GLfloat *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (F, ";"));
 }
 
 KEYWORD1 void KEYWORD2 NAME(WindowPos4dvMESA)(const GLdouble *p)
 {
-   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (";\n"));
+   DISPATCH(WindowPos4fMESA, (p[0], p[1], p[2], p[3]), (F, ";"));
 }
 
 
@@ -2689,7 +2945,7 @@ KEYWORD1 void KEYWORD2 NAME(WindowPos4dvMESA)(const GLdouble *p)
 /* GL_MESA_resize_buffers */
 KEYWORD1 void KEYWORD2 NAME(ResizeBuffersMESA)(void)
 {
-   DISPATCH(ResizeBuffersMESA, (), (";\n"));
+   DISPATCH(ResizeBuffersMESA, (), (F, "glResizeBuffersMESA();"));
 }
 
 
@@ -2697,22 +2953,22 @@ KEYWORD1 void KEYWORD2 NAME(ResizeBuffersMESA)(void)
 /* GL_ARB_transpose_matrix */
 KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixdARB)(const GLdouble m[16])
 {
-   DISPATCH(LoadTransposeMatrixdARB, (m), (";\n"));
+   DISPATCH(LoadTransposeMatrixdARB, (m), (F, "glLoadTransposeMatrixARB(%p);", m));
 }
 
 KEYWORD1 void KEYWORD2 NAME(LoadTransposeMatrixfARB)(const GLfloat m[16])
 {
-   DISPATCH(LoadTransposeMatrixfARB, (m), (";\n"));
+   DISPATCH(LoadTransposeMatrixfARB, (m), (F, "glLoadTransposeMatrixfARB(%p)", m));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultTransposeMatrixdARB)(const GLdouble m[16])
 {
-   DISPATCH(MultTransposeMatrixdARB, (m), (";\n"));
+   DISPATCH(MultTransposeMatrixdARB, (m), (F, "glMultTransposeMatrixfARB(%p)", m));
 }
 
 KEYWORD1 void KEYWORD2 NAME(MultTransposeMatrixfARB)(const GLfloat m[16])
 {
-   DISPATCH(MultTransposeMatrixfARB, (m), (";\n"));
+   DISPATCH(MultTransposeMatrixfARB, (m), (F, "glLoadTransposeMatrixfARB(%p)", m));
 }