diff --git a/src/mapi/glapi/gen/ARB_bindless_texture.xml b/src/mapi/glapi/gen/ARB_bindless_texture.xml
index 79be451c758..0c9167594b2 100644
--- a/src/mapi/glapi/gen/ARB_bindless_texture.xml
+++ b/src/mapi/glapi/gen/ARB_bindless_texture.xml
@@ -79,12 +79,12 @@
       <param name="handle" type="GLuint64" />
    </function>
 
-   <function name="VertexAttribL1ui64ARB" exec="vtxfmt">
+   <function name="VertexAttribL1ui64ARB" exec="beginend">
       <param name="index" type="GLuint" />
       <param name="x" type="GLuint64EXT" />
    </function>
 
-   <function name="VertexAttribL1ui64vARB" exec="vtxfmt">
+   <function name="VertexAttribL1ui64vARB" exec="beginend">
       <param name="index" type="GLuint" />
       <param name="v" type="const GLuint64EXT *" count="1"/>
    </function>
diff --git a/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml b/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
index 75d7468ac6f..c9b75c5f03c 100644
--- a/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
+++ b/src/mapi/glapi/gen/ARB_vertex_attrib_64bit.xml
@@ -5,25 +5,25 @@
 
 <category name="GL_ARB_vertex_attrib_64bit" number="99">
 
-    <function name="VertexAttribL1d" exec="vtxfmt">
+    <function name="VertexAttribL1d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL2d" exec="vtxfmt">
+    <function name="VertexAttribL2d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL3d" exec="vtxfmt">
+    <function name="VertexAttribL3d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL4d" exec="vtxfmt">
+    <function name="VertexAttribL4d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
@@ -31,22 +31,22 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttribL1dv" exec="vtxfmt">
+    <function name="VertexAttribL1dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="1"/>
     </function>
 
-    <function name="VertexAttribL2dv" exec="vtxfmt">
+    <function name="VertexAttribL2dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="2"/>
     </function>
 
-    <function name="VertexAttribL3dv" exec="vtxfmt">
+    <function name="VertexAttribL3dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="3"/>
     </function>
 
-    <function name="VertexAttribL4dv" exec="vtxfmt">
+    <function name="VertexAttribL4dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="4"/>
     </function>
diff --git a/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml b/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml
index 282621f22fe..719bc7966c4 100644
--- a/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml
+++ b/src/mapi/glapi/gen/ARB_vertex_type_2_10_10_10_rev.xml
@@ -7,214 +7,214 @@
 
     <enum name="INT_2_10_10_10_REV"                value = "0x8D9F"/>
 
-    <function name="VertexP2ui" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexP2ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="value" type="GLuint"/>
     </function>
 
-    <function name="VertexP3ui" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexP3ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="value" type="GLuint"/>
     </function>
 
-    <function name="VertexP4ui" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexP4ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="value" type="GLuint"/>
     </function>
 
-    <function name="VertexP2uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexP2uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="value" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="VertexP3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexP3uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="value" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="VertexP4uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexP4uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="value" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="TexCoordP1ui" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP1ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="TexCoordP2ui" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP2ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="TexCoordP3ui" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP3ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="TexCoordP4ui" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP4ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="TexCoordP1uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP1uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="TexCoordP2uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP2uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="TexCoordP3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP3uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="TexCoordP4uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoordP4uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="MultiTexCoordP1ui" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP1ui" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="MultiTexCoordP2ui" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP2ui" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="MultiTexCoordP3ui" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP3ui" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="MultiTexCoordP4ui" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP4ui" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="MultiTexCoordP1uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP1uiv" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="MultiTexCoordP2uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP2uiv" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="MultiTexCoordP3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP3uiv" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="MultiTexCoordP4uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoordP4uiv" deprecated="3.1" exec="beginend">
         <param name="texture" type="GLenum"/>
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="NormalP3ui" deprecated="3.1" exec="vtxfmt">
+    <function name="NormalP3ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="GLuint"/>
     </function>
 
-    <function name="NormalP3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="NormalP3uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="coords" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="ColorP3ui" deprecated="3.1" exec="vtxfmt">
+    <function name="ColorP3ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="color" type="GLuint"/>
     </function>
 
-    <function name="ColorP4ui" deprecated="3.1" exec="vtxfmt">
+    <function name="ColorP4ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="color" type="GLuint"/>
     </function>
 
-    <function name="ColorP3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="ColorP3uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="color" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="ColorP4uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="ColorP4uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="color" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="SecondaryColorP3ui" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColorP3ui" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="color" type="GLuint"/>
     </function>
 
-    <function name="SecondaryColorP3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColorP3uiv" deprecated="3.1" exec="beginend">
         <param name="type" type="GLenum"/>
         <param name="color" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="VertexAttribP1ui" exec="vtxfmt">
+    <function name="VertexAttribP1ui" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="value" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribP2ui" exec="vtxfmt">
+    <function name="VertexAttribP2ui" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="value" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribP3ui" exec="vtxfmt">
+    <function name="VertexAttribP3ui" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="value" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribP4ui" exec="vtxfmt">
+    <function name="VertexAttribP4ui" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="value" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribP1uiv" exec="vtxfmt">
+    <function name="VertexAttribP1uiv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="value" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="VertexAttribP2uiv" exec="vtxfmt">
+    <function name="VertexAttribP2uiv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="value" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="VertexAttribP3uiv" exec="vtxfmt">
+    <function name="VertexAttribP3uiv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
         <param name="value" type="const GLuint *" count="1"/>
     </function>
 
-    <function name="VertexAttribP4uiv" exec="vtxfmt">
+    <function name="VertexAttribP4uiv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="type" type="GLenum"/>
         <param name="normalized" type="GLboolean"/>
diff --git a/src/mapi/glapi/gen/EXT_gpu_shader4.xml b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
index 1561d97af4c..b829319ed6f 100644
--- a/src/mapi/glapi/gen/EXT_gpu_shader4.xml
+++ b/src/mapi/glapi/gen/EXT_gpu_shader4.xml
@@ -40,25 +40,25 @@
     </enum>
 
 
-    <function name="VertexAttribI1iEXT" exec="vtxfmt">
+    <function name="VertexAttribI1iEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLint"/>
     </function>
 
-    <function name="VertexAttribI2iEXT" exec="vtxfmt">
+    <function name="VertexAttribI2iEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
     </function>
 
-    <function name="VertexAttribI3iEXT" exec="vtxfmt">
+    <function name="VertexAttribI3iEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
     </function>
 
-    <function name="VertexAttribI4iEXT" exec="vtxfmt">
+    <function name="VertexAttribI4iEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
@@ -66,25 +66,25 @@
         <param name="w" type="GLint"/>
     </function>
 
-    <function name="VertexAttribI1uiEXT" exec="vtxfmt">
+    <function name="VertexAttribI1uiEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribI2uiEXT" exec="vtxfmt">
+    <function name="VertexAttribI2uiEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribI3uiEXT" exec="vtxfmt">
+    <function name="VertexAttribI3uiEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
         <param name="z" type="GLuint"/>
     </function>
 
-    <function name="VertexAttribI4uiEXT" exec="vtxfmt">
+    <function name="VertexAttribI4uiEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLuint"/>
         <param name="y" type="GLuint"/>
@@ -97,17 +97,17 @@
         <param name="v" type="const GLint *"/>
     </function>
 
-    <function name="VertexAttribI2ivEXT" exec="vtxfmt">
+    <function name="VertexAttribI2ivEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *" count="2"/>
     </function>
 
-    <function name="VertexAttribI3ivEXT" exec="vtxfmt">
+    <function name="VertexAttribI3ivEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *" count="3"/>
     </function>
 
-    <function name="VertexAttribI4ivEXT" exec="vtxfmt">
+    <function name="VertexAttribI4ivEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *" count="4"/>
     </function>
@@ -117,17 +117,17 @@
         <param name="v" type="const GLuint *"/>
     </function>
 
-    <function name="VertexAttribI2uivEXT" exec="vtxfmt">
+    <function name="VertexAttribI2uivEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *" count="2"/>
     </function>
 
-    <function name="VertexAttribI3uivEXT" exec="vtxfmt">
+    <function name="VertexAttribI3uivEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *" count="3"/>
     </function>
 
-    <function name="VertexAttribI4uivEXT" exec="vtxfmt">
+    <function name="VertexAttribI4uivEXT" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *" count="4"/>
     </function>
diff --git a/src/mapi/glapi/gen/GL3x.xml b/src/mapi/glapi/gen/GL3x.xml
index 75307d78c0a..e6fd27b9a0d 100644
--- a/src/mapi/glapi/gen/GL3x.xml
+++ b/src/mapi/glapi/gen/GL3x.xml
@@ -330,7 +330,7 @@
     <param name="w" type="GLuint"/>
   </function>
 
-  <function name="VertexAttribI1iv" exec="vtxfmt">
+  <function name="VertexAttribI1iv" exec="beginend">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLint *" count="1"/>
   </function>
@@ -350,7 +350,7 @@
     <param name="v" type="const GLint *"/>
   </function>
 
-  <function name="VertexAttribI1uiv" exec="vtxfmt">
+  <function name="VertexAttribI1uiv" exec="beginend">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLuint *" count="1"/>
   </function>
@@ -370,22 +370,22 @@
     <param name="v" type="const GLuint *"/>
   </function>
 
-  <function name="VertexAttribI4bv" exec="vtxfmt">
+  <function name="VertexAttribI4bv" exec="beginend">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLbyte *" count="4"/>
   </function>
 
-  <function name="VertexAttribI4sv" exec="vtxfmt">
+  <function name="VertexAttribI4sv" exec="beginend">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLshort *" count="4"/>
   </function>
 
-  <function name="VertexAttribI4ubv" exec="vtxfmt">
+  <function name="VertexAttribI4ubv" exec="beginend">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLubyte *" count="4"/>
   </function>
 
-  <function name="VertexAttribI4usv" exec="vtxfmt">
+  <function name="VertexAttribI4usv" exec="beginend">
     <param name="index" type="GLuint"/>
     <param name="v" type="const GLushort *" count="4"/>
   </function>
diff --git a/src/mapi/glapi/gen/NV_half_float.xml b/src/mapi/glapi/gen/NV_half_float.xml
index 40965bd10e6..30d56923e55 100644
--- a/src/mapi/glapi/gen/NV_half_float.xml
+++ b/src/mapi/glapi/gen/NV_half_float.xml
@@ -5,139 +5,139 @@
 
 <category name="GL_NV_half_float" number="283">
 
-    <function name="Vertex2hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Vertex2hNV" exec="beginend" deprecated="3.1">
         <param name="x" type="GLhalfNV"/>
         <param name="y" type="GLhalfNV"/>
     </function>
 
-    <function name="Vertex2hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Vertex2hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="2"/>
     </function>
 
-    <function name="Vertex3hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Vertex3hNV" exec="beginend" deprecated="3.1">
         <param name="x" type="GLhalfNV"/>
         <param name="y" type="GLhalfNV"/>
         <param name="z" type="GLhalfNV"/>
     </function>
 
-    <function name="Vertex3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Vertex3hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="3"/>
     </function>
 
-    <function name="Vertex4hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Vertex4hNV" exec="beginend" deprecated="3.1">
         <param name="x" type="GLhalfNV"/>
         <param name="y" type="GLhalfNV"/>
         <param name="z" type="GLhalfNV"/>
         <param name="w" type="GLhalfNV"/>
     </function>
 
-    <function name="Vertex4hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Vertex4hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="4"/>
     </function>
 
-    <function name="Normal3hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Normal3hNV" exec="beginend" deprecated="3.1">
         <param name="nx" type="GLhalfNV"/>
         <param name="ny" type="GLhalfNV"/>
         <param name="nz" type="GLhalfNV"/>
     </function>
 
-    <function name="Normal3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Normal3hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="3"/>
     </function>
 
-    <function name="Color3hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Color3hNV" exec="beginend" deprecated="3.1">
         <param name="red" type="GLhalfNV"/>
         <param name="green" type="GLhalfNV"/>
         <param name="blue" type="GLhalfNV"/>
     </function>
 
-    <function name="Color3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Color3hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="3"/>
     </function>
 
-    <function name="Color4hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Color4hNV" exec="beginend" deprecated="3.1">
         <param name="red" type="GLhalfNV"/>
         <param name="green" type="GLhalfNV"/>
         <param name="blue" type="GLhalfNV"/>
         <param name="alpha" type="GLhalfNV"/>
     </function>
 
-    <function name="Color4hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="Color4hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="4"/>
     </function>
 
-    <function name="TexCoord1hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord1hNV" exec="beginend" deprecated="3.1">
         <param name="s" type="GLhalfNV"/>
     </function>
 
-    <function name="TexCoord1hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord1hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="1"/>
     </function>
 
-    <function name="TexCoord2hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord2hNV" exec="beginend" deprecated="3.1">
         <param name="s" type="GLhalfNV"/>
         <param name="t" type="GLhalfNV"/>
     </function>
 
-    <function name="TexCoord2hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord2hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="2"/>
     </function>
 
-    <function name="TexCoord3hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord3hNV" exec="beginend" deprecated="3.1">
         <param name="s" type="GLhalfNV"/>
         <param name="t" type="GLhalfNV"/>
         <param name="r" type="GLhalfNV"/>
     </function>
 
-    <function name="TexCoord3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord3hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="3"/>
     </function>
 
-    <function name="TexCoord4hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord4hNV" exec="beginend" deprecated="3.1">
         <param name="s" type="GLhalfNV"/>
         <param name="t" type="GLhalfNV"/>
         <param name="r" type="GLhalfNV"/>
         <param name="q" type="GLhalfNV"/>
     </function>
 
-    <function name="TexCoord4hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="TexCoord4hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="4"/>
     </function>
 
-    <function name="MultiTexCoord1hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord1hNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLhalfNV"/>
     </function>
 
-    <function name="MultiTexCoord1hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord1hvNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLhalfNV *" count="1"/>
     </function>
 
-    <function name="MultiTexCoord2hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord2hNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLhalfNV"/>
         <param name="t" type="GLhalfNV"/>
     </function>
 
-    <function name="MultiTexCoord2hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord2hvNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLhalfNV *" count="2"/>
     </function>
 
-    <function name="MultiTexCoord3hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord3hNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLhalfNV"/>
         <param name="t" type="GLhalfNV"/>
         <param name="r" type="GLhalfNV"/>
     </function>
 
-    <function name="MultiTexCoord3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord3hvNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLhalfNV *" count="3"/>
     </function>
 
-    <function name="MultiTexCoord4hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord4hNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLhalfNV"/>
         <param name="t" type="GLhalfNV"/>
@@ -145,45 +145,45 @@
         <param name="q" type="GLhalfNV"/>
     </function>
 
-    <function name="MultiTexCoord4hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="MultiTexCoord4hvNV" exec="beginend" deprecated="3.1">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLhalfNV *" count="4"/>
     </function>
 
-    <function name="VertexAttrib1hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib1hNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLhalfNV"/>
     </function>
 
-    <function name="VertexAttrib1hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib1hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLhalfNV *" count="1"/>
     </function>
 
-    <function name="VertexAttrib2hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib2hNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLhalfNV"/>
         <param name="y" type="GLhalfNV"/>
     </function>
 
-    <function name="VertexAttrib2hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib2hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLhalfNV *" count="2"/>
     </function>
 
-    <function name="VertexAttrib3hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib3hNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLhalfNV"/>
         <param name="y" type="GLhalfNV"/>
         <param name="z" type="GLhalfNV"/>
     </function>
 
-    <function name="VertexAttrib3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib3hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLhalfNV *" count="3"/>
     </function>
 
-    <function name="VertexAttrib4hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib4hNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLhalfNV"/>
         <param name="y" type="GLhalfNV"/>
@@ -191,50 +191,50 @@
         <param name="w" type="GLhalfNV"/>
     </function>
 
-    <function name="VertexAttrib4hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttrib4hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLhalfNV *" count="4"/>
     </function>
 
-    <function name="VertexAttribs1hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttribs1hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei"/>
         <param name="v" type="const GLhalfNV *" count="n"/>
     </function>
 
-    <function name="VertexAttribs2hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttribs2hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei"/>
         <param name="v" type="const GLhalfNV *" count="n" count_scale="2"/>
     </function>
 
-    <function name="VertexAttribs3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttribs3hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei"/>
         <param name="v" type="const GLhalfNV *" count="n" count_scale="3"/>
     </function>
 
-    <function name="VertexAttribs4hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="VertexAttribs4hvNV" exec="beginend" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei"/>
         <param name="v" type="const GLhalfNV *" count="n" count_scale="4"/>
     </function>
 
-    <function name="FogCoordhNV" exec="vtxfmt" deprecated="3.1">
+    <function name="FogCoordhNV" exec="beginend" deprecated="3.1">
         <param name="x" type="GLhalfNV"/>
     </function>
 
-    <function name="FogCoordhvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="FogCoordhvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="1"/>
     </function>
 
-    <function name="SecondaryColor3hNV" exec="vtxfmt" deprecated="3.1">
+    <function name="SecondaryColor3hNV" exec="beginend" deprecated="3.1">
         <param name="red" type="GLhalfNV"/>
         <param name="green" type="GLhalfNV"/>
         <param name="blue" type="GLhalfNV"/>
     </function>
 
-    <function name="SecondaryColor3hvNV" exec="vtxfmt" deprecated="3.1">
+    <function name="SecondaryColor3hvNV" exec="beginend" deprecated="3.1">
         <param name="v" type="const GLhalfNV *" count="3"/>
     </function>
 
diff --git a/src/mapi/glapi/gen/NV_primitive_restart.xml b/src/mapi/glapi/gen/NV_primitive_restart.xml
index e53062f78ea..eaed2f7c46e 100644
--- a/src/mapi/glapi/gen/NV_primitive_restart.xml
+++ b/src/mapi/glapi/gen/NV_primitive_restart.xml
@@ -11,7 +11,7 @@
     <enum name="PRIMITIVE_RESTART_NV"        value="0x8558"/>
     <enum name="PRIMITIVE_RESTART_INDEX_NV"  value="0x8559"/>
 
-    <function name="PrimitiveRestartNV" deprecated="3.1" exec="vtxfmt"/>
+    <function name="PrimitiveRestartNV" deprecated="3.1" exec="beginend"/>
 
     <function name="PrimitiveRestartIndexNV" alias="PrimitiveRestartIndex">
 	<param name="index" type="GLuint"/>
diff --git a/src/mapi/glapi/gen/api_vtxfmt_init_h.py b/src/mapi/glapi/gen/api_beginend_init_h.py
similarity index 95%
rename from src/mapi/glapi/gen/api_vtxfmt_init_h.py
rename to src/mapi/glapi/gen/api_beginend_init_h.py
index 6bd9bb1f107..b0aab7b5f81 100644
--- a/src/mapi/glapi/gen/api_vtxfmt_init_h.py
+++ b/src/mapi/glapi/gen/api_beginend_init_h.py
@@ -20,7 +20,7 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 
-# This script generates the file api_vtxfmt_init.h.
+# This script generates the file api_beginend_init.h.
 
 import argparse
 import collections
@@ -35,7 +35,7 @@ class PrintCode(gl_XML.gl_print_base):
     def __init__(self):
         super().__init__()
 
-        self.name = 'api_vtxfmt_init_h.py'
+        self.name = 'api_beginend_init_h.py'
         self.license = license.bsd_license_template % (
             'Copyright (C) 2012 Intel Corporation\n'
             'Copyright (C) 2021 Advanced Micro Devices, Inc.',
@@ -47,7 +47,7 @@ class PrintCode(gl_XML.gl_print_base):
         settings_by_condition = collections.defaultdict(lambda: [])
 
         for f in api.functionIterateAll():
-            if f.exec_flavor != 'vtxfmt':
+            if f.exec_flavor != 'beginend':
                 continue
 
             condition = apiexec.get_api_condition(f)
diff --git a/src/mapi/glapi/gen/api_exec_init.py b/src/mapi/glapi/gen/api_exec_init.py
index 35ac3bb889c..b7ad95dd7e5 100644
--- a/src/mapi/glapi/gen/api_exec_init.py
+++ b/src/mapi/glapi/gen/api_exec_init.py
@@ -33,7 +33,7 @@ import apiexec
 
 
 exec_flavor_map = {
-    'vtxfmt': None,
+    'beginend': None,
     'dlist': '_mesa_',
     'mesa': '_mesa_',
     'skip': None,
@@ -105,7 +105,7 @@ class PrintCode(gl_XML.gl_print_base):
             prefix = exec_flavor_map[f.exec_flavor]
             if prefix is None:
                 # This function is not implemented, or is dispatched
-                # via vtxfmt.
+                # via beginend.
                 continue
             if f.has_no_error_variant:
                 no_error_condition = '_mesa_is_no_error_enabled(ctx) && ({0})'.format(condition)
diff --git a/src/mapi/glapi/gen/api_hw_select_init_h.py b/src/mapi/glapi/gen/api_hw_select_init_h.py
index ae8cdda2c1c..8d2e851f9c1 100644
--- a/src/mapi/glapi/gen/api_hw_select_init_h.py
+++ b/src/mapi/glapi/gen/api_hw_select_init_h.py
@@ -43,7 +43,7 @@ class PrintCode(gl_XML.gl_print_base):
 
     def printBody(self, api):
         for f in api.functionIterateAll():
-            if f.exec_flavor != 'vtxfmt':
+            if f.exec_flavor != 'beginend':
                 continue
 
             if (re.match('Vertex*', f.name)):
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index 35bbac8c8d1..fc69c152c0b 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -1122,12 +1122,12 @@
         <glx sop="102"/>
     </function>
 
-    <function name="CallList" deprecated="3.1" marshal="custom" exec="vtxfmt">
+    <function name="CallList" deprecated="3.1" marshal="custom" exec="beginend">
         <param name="list" type="GLuint"/>
         <glx rop="1"/>
     </function>
 
-    <function name="CallLists" deprecated="3.1" exec="vtxfmt"
+    <function name="CallLists" deprecated="3.1" exec="beginend"
               marshal_call_after="_mesa_glthread_CallLists(ctx, n, type, lists);">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="type" type="GLenum"/>
@@ -1155,7 +1155,7 @@
         <glx rop="3"/>
     </function>
 
-    <function name="Begin" deprecated="3.1" exec="vtxfmt"
+    <function name="Begin" deprecated="3.1" exec="beginend"
               marshal_call_after="ctx->GLThread.inside_begin_end = true;">
         <param name="mode" type="GLenum"/>
         <glx rop="4"/>
@@ -1173,157 +1173,157 @@
         <glx rop="5" large="true"/>
     </function>
 
-    <function name="Color3b" vectorequiv="Color3bv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3b" vectorequiv="Color3bv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
     </function>
 
-    <function name="Color3bv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3bv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLbyte *" count="3"/>
         <glx rop="6"/>
     </function>
 
-    <function name="Color3d" vectorequiv="Color3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3d" vectorequiv="Color3dv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
     </function>
 
-    <function name="Color3dv" deprecated="3.1"  exec="vtxfmt">
+    <function name="Color3dv" deprecated="3.1"  exec="beginend">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="7"/>
     </function>
 
     <function name="Color3f" vectorequiv="Color3fv"
-	      deprecated="3.1" exec="vtxfmt">
+	      deprecated="3.1" exec="beginend">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
     </function>
 
-    <function name="Color3fv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="8"/>
     </function>
 
-    <function name="Color3i" vectorequiv="Color3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3i" vectorequiv="Color3iv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
     </function>
 
-    <function name="Color3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="9"/>
     </function>
 
-    <function name="Color3s" vectorequiv="Color3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3s" vectorequiv="Color3sv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
     </function>
 
-    <function name="Color3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="10"/>
     </function>
 
-    <function name="Color3ub" vectorequiv="Color3ubv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3ub" vectorequiv="Color3ubv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
     </function>
 
-    <function name="Color3ubv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3ubv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLubyte *" count="3"/>
         <glx rop="11"/>
     </function>
 
-    <function name="Color3ui" vectorequiv="Color3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3ui" vectorequiv="Color3uiv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
     </function>
 
-    <function name="Color3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3uiv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLuint *" count="3"/>
         <glx rop="12"/>
     </function>
 
-    <function name="Color3us" vectorequiv="Color3usv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3us" vectorequiv="Color3usv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
     </function>
 
-    <function name="Color3usv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color3usv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLushort *" count="3"/>
         <glx rop="13"/>
     </function>
 
-    <function name="Color4b" vectorequiv="Color4bv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4b" vectorequiv="Color4bv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
         <param name="alpha" type="GLbyte"/>
     </function>
 
-    <function name="Color4bv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4bv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLbyte *" count="4"/>
         <glx rop="14"/>
     </function>
 
-    <function name="Color4d" vectorequiv="Color4dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4d" vectorequiv="Color4dv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
         <param name="alpha" type="GLdouble"/>
     </function>
 
-    <function name="Color4dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="15"/>
     </function>
 
     <function name="Color4f" vectorequiv="Color4fv" es1="1.0"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
         <param name="alpha" type="GLfloat"/>
     </function>
 
-    <function name="Color4fv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="16"/>
     </function>
 
-    <function name="Color4i" vectorequiv="Color4iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4i" vectorequiv="Color4iv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
         <param name="alpha" type="GLint"/>
     </function>
 
-    <function name="Color4iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="17"/>
     </function>
 
-    <function name="Color4s" vectorequiv="Color4sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4s" vectorequiv="Color4sv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
         <param name="alpha" type="GLshort"/>
     </function>
 
-    <function name="Color4sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="18"/>
     </function>
 
-    <function name="Color4ub" vectorequiv="Color4ubv" es1="1.1" exec="vtxfmt"
+    <function name="Color4ub" vectorequiv="Color4ubv" es1="1.1" exec="beginend"
               deprecated="3.1">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
@@ -1331,139 +1331,139 @@
         <param name="alpha" type="GLubyte"/>
     </function>
 
-    <function name="Color4ubv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4ubv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLubyte *" count="4"/>
         <glx rop="19"/>
     </function>
 
-    <function name="Color4ui" vectorequiv="Color4uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4ui" vectorequiv="Color4uiv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
         <param name="alpha" type="GLuint"/>
     </function>
 
-    <function name="Color4uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4uiv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLuint *" count="4"/>
         <glx rop="20"/>
     </function>
 
-    <function name="Color4us" vectorequiv="Color4usv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4us" vectorequiv="Color4usv" deprecated="3.1" exec="beginend">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
         <param name="alpha" type="GLushort"/>
     </function>
 
-    <function name="Color4usv" deprecated="3.1" exec="vtxfmt">
+    <function name="Color4usv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLushort *" count="4"/>
         <glx rop="21"/>
     </function>
 
     <function name="EdgeFlag" vectorequiv="EdgeFlagv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="flag" type="GLboolean"/>
     </function>
 
-    <function name="EdgeFlagv" deprecated="3.1" exec="vtxfmt">
+    <function name="EdgeFlagv" deprecated="3.1" exec="beginend">
         <param name="flag" type="const GLboolean *" count="1"/>
         <glx rop="22"/>
     </function>
 
-    <function name="End" deprecated="3.1" exec="vtxfmt"
+    <function name="End" deprecated="3.1" exec="beginend"
               marshal_call_after="ctx->GLThread.inside_begin_end = false;">
         <glx rop="23"/>
     </function>
 
-    <function name="Indexd" vectorequiv="Indexdv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexd" vectorequiv="Indexdv" deprecated="3.1" exec="beginend">
         <param name="c" type="GLdouble"/>
     </function>
 
-    <function name="Indexdv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexdv" deprecated="3.1" exec="beginend">
         <param name="c" type="const GLdouble *" count="1"/>
         <glx rop="24"/>
     </function>
 
     <function name="Indexf" vectorequiv="Indexfv" deprecated="3.1"
-              exec="vtxfmt">
+              exec="beginend">
         <param name="c" type="GLfloat"/>
     </function>
 
-    <function name="Indexfv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexfv" deprecated="3.1" exec="beginend">
         <param name="c" type="const GLfloat *" count="1"/>
         <glx rop="25"/>
     </function>
 
-    <function name="Indexi" vectorequiv="Indexiv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexi" vectorequiv="Indexiv" deprecated="3.1" exec="beginend">
         <param name="c" type="GLint"/>
     </function>
 
-    <function name="Indexiv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexiv" deprecated="3.1" exec="beginend">
         <param name="c" type="const GLint *" count="1"/>
         <glx rop="26"/>
     </function>
 
-    <function name="Indexs" vectorequiv="Indexsv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexs" vectorequiv="Indexsv" deprecated="3.1" exec="beginend">
         <param name="c" type="GLshort"/>
     </function>
 
-    <function name="Indexsv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexsv" deprecated="3.1" exec="beginend">
         <param name="c" type="const GLshort *" count="1"/>
         <glx rop="27"/>
     </function>
 
-    <function name="Normal3b" vectorequiv="Normal3bv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3b" vectorequiv="Normal3bv" deprecated="3.1" exec="beginend">
         <param name="nx" type="GLbyte"/>
         <param name="ny" type="GLbyte"/>
         <param name="nz" type="GLbyte"/>
     </function>
 
-    <function name="Normal3bv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3bv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLbyte *" count="3"/>
         <glx rop="28"/>
     </function>
 
-    <function name="Normal3d" vectorequiv="Normal3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3d" vectorequiv="Normal3dv" deprecated="3.1" exec="beginend">
         <param name="nx" type="GLdouble"/>
         <param name="ny" type="GLdouble"/>
         <param name="nz" type="GLdouble"/>
     </function>
 
-    <function name="Normal3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="29"/>
     </function>
 
     <function name="Normal3f" vectorequiv="Normal3fv" es1="1.0"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="nx" type="GLfloat"/>
         <param name="ny" type="GLfloat"/>
         <param name="nz" type="GLfloat"/>
     </function>
 
-    <function name="Normal3fv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="30"/>
     </function>
 
-    <function name="Normal3i" vectorequiv="Normal3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3i" vectorequiv="Normal3iv" deprecated="3.1" exec="beginend">
         <param name="nx" type="GLint"/>
         <param name="ny" type="GLint"/>
         <param name="nz" type="GLint"/>
     </function>
 
-    <function name="Normal3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="31"/>
     </function>
 
-    <function name="Normal3s" vectorequiv="Normal3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3s" vectorequiv="Normal3sv" deprecated="3.1" exec="beginend">
         <param name="nx" type="GLshort"/>
         <param name="ny" type="GLshort"/>
         <param name="nz" type="GLshort"/>
     </function>
 
-    <function name="Normal3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Normal3sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="32"/>
     </function>
@@ -1652,309 +1652,309 @@
         <glx rop="48"/>
     </function>
 
-    <function name="TexCoord1d" vectorequiv="TexCoord1dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord1d" vectorequiv="TexCoord1dv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord1dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord1dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="1"/>
         <glx rop="49"/>
     </function>
 
     <function name="TexCoord1f" vectorequiv="TexCoord1fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="s" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord1fv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord1fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="50"/>
     </function>
 
-    <function name="TexCoord1i" vectorequiv="TexCoord1iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord1i" vectorequiv="TexCoord1iv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="TexCoord1iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord1iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="1"/>
         <glx rop="51"/>
     </function>
 
-    <function name="TexCoord1s" vectorequiv="TexCoord1sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord1s" vectorequiv="TexCoord1sv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="TexCoord1sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord1sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="1"/>
         <glx rop="52"/>
     </function>
 
-    <function name="TexCoord2d" vectorequiv="TexCoord2dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord2d" vectorequiv="TexCoord2dv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord2dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord2dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="53"/>
     </function>
 
     <function name="TexCoord2f" vectorequiv="TexCoord2fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord2fv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord2fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="54"/>
     </function>
 
-    <function name="TexCoord2i" vectorequiv="TexCoord2iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord2i" vectorequiv="TexCoord2iv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
     </function>
 
-    <function name="TexCoord2iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord2iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="2"/>
         <glx rop="55"/>
     </function>
 
-    <function name="TexCoord2s" vectorequiv="TexCoord2sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord2s" vectorequiv="TexCoord2sv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
     </function>
 
-    <function name="TexCoord2sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord2sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="56"/>
     </function>
 
-    <function name="TexCoord3d" vectorequiv="TexCoord3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord3d" vectorequiv="TexCoord3dv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord3dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="57"/>
     </function>
 
     <function name="TexCoord3f" vectorequiv="TexCoord3fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord3fv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord3fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="58"/>
     </function>
 
-    <function name="TexCoord3i" vectorequiv="TexCoord3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord3i" vectorequiv="TexCoord3iv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
     </function>
 
-    <function name="TexCoord3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord3iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="59"/>
     </function>
 
-    <function name="TexCoord3s" vectorequiv="TexCoord3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord3s" vectorequiv="TexCoord3sv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
     </function>
 
-    <function name="TexCoord3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord3sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="60"/>
     </function>
 
-    <function name="TexCoord4d" vectorequiv="TexCoord4dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord4d" vectorequiv="TexCoord4dv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
         <param name="q" type="GLdouble"/>
     </function>
 
-    <function name="TexCoord4dv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord4dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="61"/>
     </function>
 
     <function name="TexCoord4f" vectorequiv="TexCoord4fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
         <param name="q" type="GLfloat"/>
     </function>
 
-    <function name="TexCoord4fv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord4fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="62"/>
     </function>
 
-    <function name="TexCoord4i" vectorequiv="TexCoord4iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord4i" vectorequiv="TexCoord4iv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
         <param name="q" type="GLint"/>
     </function>
 
-    <function name="TexCoord4iv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord4iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="63"/>
     </function>
 
-    <function name="TexCoord4s" vectorequiv="TexCoord4sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord4s" vectorequiv="TexCoord4sv" deprecated="3.1" exec="beginend">
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
         <param name="q" type="GLshort"/>
     </function>
 
-    <function name="TexCoord4sv" deprecated="3.1" exec="vtxfmt">
+    <function name="TexCoord4sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="64"/>
     </function>
 
-    <function name="Vertex2d" vectorequiv="Vertex2dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex2d" vectorequiv="Vertex2dv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="Vertex2dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex2dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="65"/>
     </function>
 
     <function name="Vertex2f" vectorequiv="Vertex2fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="Vertex2fv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex2fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="66"/>
     </function>
 
-    <function name="Vertex2i" vectorequiv="Vertex2iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex2i" vectorequiv="Vertex2iv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
     </function>
 
-    <function name="Vertex2iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex2iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="2"/>
         <glx rop="67"/>
     </function>
 
-    <function name="Vertex2s" vectorequiv="Vertex2sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex2s" vectorequiv="Vertex2sv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="Vertex2sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex2sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="68"/>
     </function>
 
-    <function name="Vertex3d" vectorequiv="Vertex3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex3d" vectorequiv="Vertex3dv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="Vertex3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex3dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="69"/>
     </function>
 
     <function name="Vertex3f" vectorequiv="Vertex3fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="Vertex3fv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex3fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="70"/>
     </function>
 
-    <function name="Vertex3i" vectorequiv="Vertex3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex3i" vectorequiv="Vertex3iv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
     </function>
 
-    <function name="Vertex3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex3iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="71"/>
     </function>
 
-    <function name="Vertex3s" vectorequiv="Vertex3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex3s" vectorequiv="Vertex3sv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="Vertex3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex3sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="72"/>
     </function>
 
-    <function name="Vertex4d" vectorequiv="Vertex4dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex4d" vectorequiv="Vertex4dv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="Vertex4dv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex4dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="73"/>
     </function>
 
     <function name="Vertex4f" vectorequiv="Vertex4fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="Vertex4fv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex4fv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="74"/>
     </function>
 
-    <function name="Vertex4i" vectorequiv="Vertex4iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex4i" vectorequiv="Vertex4iv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLint"/>
         <param name="y" type="GLint"/>
         <param name="z" type="GLint"/>
         <param name="w" type="GLint"/>
     </function>
 
-    <function name="Vertex4iv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex4iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="75"/>
     </function>
 
-    <function name="Vertex4s" vectorequiv="Vertex4sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex4s" vectorequiv="Vertex4sv" deprecated="3.1" exec="beginend">
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
         <param name="w" type="GLshort"/>
     </function>
 
-    <function name="Vertex4sv" deprecated="3.1" exec="vtxfmt">
+    <function name="Vertex4sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="76"/>
     </function>
@@ -2080,14 +2080,14 @@
         <glx rop="95"/>
     </function>
 
-    <function name="Materialf" es1="1.0" deprecated="3.1" exec="vtxfmt">
+    <function name="Materialf" es1="1.0" deprecated="3.1" exec="beginend">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx rop="96"/>
     </function>
 
-    <function name="Materialfv" es1="1.0" deprecated="3.1" exec="vtxfmt">
+    <function name="Materialfv" es1="1.0" deprecated="3.1" exec="beginend">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *" variable_param="pname"
@@ -2095,14 +2095,14 @@
         <glx rop="97"/>
     </function>
 
-    <function name="Materiali" deprecated="3.1" exec="vtxfmt">
+    <function name="Materiali" deprecated="3.1" exec="beginend">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx rop="98"/>
     </function>
 
-    <function name="Materialiv" deprecated="3.1" exec="vtxfmt">
+    <function name="Materialiv" deprecated="3.1" exec="beginend">
         <param name="face" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *" variable_param="pname"
@@ -2498,42 +2498,42 @@
         <glx rop="150"/>
     </function>
 
-    <function name="EvalCoord1d" vectorequiv="EvalCoord1dv" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalCoord1d" vectorequiv="EvalCoord1dv" deprecated="3.1" exec="beginend">
         <param name="u" type="GLdouble"/>
     </function>
 
-    <function name="EvalCoord1dv" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalCoord1dv" deprecated="3.1" exec="beginend">
         <param name="u" type="const GLdouble *" count="1"/>
         <glx rop="151"/>
     </function>
 
     <function name="EvalCoord1f" vectorequiv="EvalCoord1fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="u" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord1fv" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalCoord1fv" deprecated="3.1" exec="beginend">
         <param name="u" type="const GLfloat *" count="1"/>
         <glx rop="152"/>
     </function>
 
-    <function name="EvalCoord2d" vectorequiv="EvalCoord2dv" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalCoord2d" vectorequiv="EvalCoord2dv" deprecated="3.1" exec="beginend">
         <param name="u" type="GLdouble"/>
         <param name="v" type="GLdouble"/>
     </function>
 
-    <function name="EvalCoord2dv" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalCoord2dv" deprecated="3.1" exec="beginend">
         <param name="u" type="const GLdouble *" count="2"/>
         <glx rop="153"/>
     </function>
 
     <function name="EvalCoord2f" vectorequiv="EvalCoord2fv"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="u" type="GLfloat"/>
         <param name="v" type="GLfloat"/>
     </function>
 
-    <function name="EvalCoord2fv" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalCoord2fv" deprecated="3.1" exec="beginend">
         <param name="u" type="const GLfloat *" count="2"/>
         <glx rop="154"/>
     </function>
@@ -2545,7 +2545,7 @@
         <glx rop="155"/>
     </function>
 
-    <function name="EvalPoint1" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalPoint1" deprecated="3.1" exec="beginend">
         <param name="i" type="GLint"/>
         <glx rop="156"/>
     </function>
@@ -2559,7 +2559,7 @@
         <glx rop="157"/>
     </function>
 
-    <function name="EvalPoint2" deprecated="3.1" exec="vtxfmt">
+    <function name="EvalPoint2" deprecated="3.1" exec="beginend">
         <param name="i" type="GLint"/>
         <param name="j" type="GLint"/>
         <glx rop="158"/>
@@ -3188,7 +3188,7 @@
     <enum name="CLIENT_VERTEX_ARRAY_BIT"                  value="0x00000002"/>
     <enum name="CLIENT_ALL_ATTRIB_BITS"                   value="0xFFFFFFFF"/>
 
-    <function name="ArrayElement" deprecated="3.1" exec="vtxfmt">
+    <function name="ArrayElement" deprecated="3.1" exec="beginend">
         <param name="i" type="GLint"/>
         <glx handcode="true"/>
     </function>
@@ -3408,11 +3408,11 @@
         <glx rop="4118"/>
     </function>
 
-    <function name="Indexub" vectorequiv="Indexubv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexub" vectorequiv="Indexubv" deprecated="3.1" exec="beginend">
         <param name="c" type="GLubyte"/>
     </function>
 
-    <function name="Indexubv" deprecated="3.1" exec="vtxfmt">
+    <function name="Indexubv" deprecated="3.1" exec="beginend">
         <param name="c" type="const GLubyte *" count="1"/>
         <glx rop="194"/>
     </function>
@@ -4327,12 +4327,12 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="MultiTexCoord1d" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord1d" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord1dv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord1dv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLdouble *" count="1"/>
         <glx rop="198"/>
@@ -4349,35 +4349,35 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord1i" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord1i" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord1iv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord1iv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLint *" count="1"/>
         <glx rop="200"/>
     </function>
 
-    <function name="MultiTexCoord1s" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord1s" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord1sv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord1sv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLshort *" count="1"/>
         <glx rop="201"/>
     </function>
 
-    <function name="MultiTexCoord2d" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord2d" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord2dv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord2dv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="202"/>
@@ -4396,38 +4396,38 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord2i" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord2i" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord2iv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord2iv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLint *" count="2"/>
         <glx rop="204"/>
     </function>
 
-    <function name="MultiTexCoord2s" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord2s" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord2sv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord2sv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="205"/>
     </function>
 
-    <function name="MultiTexCoord3d" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord3d" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
         <param name="r" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord3dv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="206"/>
@@ -4447,33 +4447,33 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord3i" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord3i" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
         <param name="r" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord3iv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="208"/>
     </function>
 
-    <function name="MultiTexCoord3s" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord3s" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
         <param name="r" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord3sv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="209"/>
     </function>
 
-    <function name="MultiTexCoord4d" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord4d" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLdouble"/>
         <param name="t" type="GLdouble"/>
@@ -4481,7 +4481,7 @@
         <param name="q" type="GLdouble"/>
     </function>
 
-    <function name="MultiTexCoord4dv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord4dv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="210"/>
@@ -4502,7 +4502,7 @@
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="MultiTexCoord4i" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord4i" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLint"/>
         <param name="t" type="GLint"/>
@@ -4510,13 +4510,13 @@
         <param name="q" type="GLint"/>
     </function>
 
-    <function name="MultiTexCoord4iv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord4iv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="212"/>
     </function>
 
-    <function name="MultiTexCoord4s" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord4s" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLshort"/>
         <param name="t" type="GLshort"/>
@@ -4524,7 +4524,7 @@
         <param name="q" type="GLshort"/>
     </function>
 
-    <function name="MultiTexCoord4sv" deprecated="3.1" exec="vtxfmt">
+    <function name="MultiTexCoord4sv" deprecated="3.1" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="213"/>
@@ -4777,11 +4777,11 @@
         <param name="coord" type="const GLfloat *"/>
     </function>
 
-    <function name="FogCoordd" deprecated="3.1" exec="vtxfmt">
+    <function name="FogCoordd" deprecated="3.1" exec="beginend">
         <param name="coord" type="GLdouble"/>
     </function>
 
-    <function name="FogCoorddv" deprecated="3.1" exec="vtxfmt">
+    <function name="FogCoorddv" deprecated="3.1" exec="beginend">
         <param name="coord" type="const GLdouble *" count="1"/>
         <glx rop="4125"/>
     </function>
@@ -4837,91 +4837,91 @@
         <glx rop="4222"/>
     </function>
 
-    <function name="SecondaryColor3b" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3b" deprecated="3.1" exec="beginend">
         <param name="red" type="GLbyte"/>
         <param name="green" type="GLbyte"/>
         <param name="blue" type="GLbyte"/>
     </function>
 
-    <function name="SecondaryColor3bv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3bv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLbyte *" count="3"/>
         <glx rop="4126"/>
     </function>
 
-    <function name="SecondaryColor3d" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3d" deprecated="3.1" exec="beginend">
         <param name="red" type="GLdouble"/>
         <param name="green" type="GLdouble"/>
         <param name="blue" type="GLdouble"/>
     </function>
 
-    <function name="SecondaryColor3dv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3dv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="4130"/>
     </function>
 
     <function name="SecondaryColor3f" alias="SecondaryColor3fEXT"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="red" type="GLfloat"/>
         <param name="green" type="GLfloat"/>
         <param name="blue" type="GLfloat"/>
     </function>
 
     <function name="SecondaryColor3fv" alias="SecondaryColor3fvEXT"
-              deprecated="3.1" exec="vtxfmt">
+              deprecated="3.1" exec="beginend">
         <param name="v" type="const GLfloat *"/>
     </function>
 
-    <function name="SecondaryColor3i" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3i" deprecated="3.1" exec="beginend">
         <param name="red" type="GLint"/>
         <param name="green" type="GLint"/>
         <param name="blue" type="GLint"/>
     </function>
 
-    <function name="SecondaryColor3iv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3iv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLint *" count="3"/>
         <glx rop="4128"/>
     </function>
 
-    <function name="SecondaryColor3s" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3s" deprecated="3.1" exec="beginend">
         <param name="red" type="GLshort"/>
         <param name="green" type="GLshort"/>
         <param name="blue" type="GLshort"/>
     </function>
 
-    <function name="SecondaryColor3sv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3sv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="4127"/>
     </function>
 
-    <function name="SecondaryColor3ub" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3ub" deprecated="3.1" exec="beginend">
         <param name="red" type="GLubyte"/>
         <param name="green" type="GLubyte"/>
         <param name="blue" type="GLubyte"/>
     </function>
 
-    <function name="SecondaryColor3ubv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3ubv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLubyte *" count="3"/>
         <glx rop="4131"/>
     </function>
 
-    <function name="SecondaryColor3ui" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3ui" deprecated="3.1" exec="beginend">
         <param name="red" type="GLuint"/>
         <param name="green" type="GLuint"/>
         <param name="blue" type="GLuint"/>
     </function>
 
-    <function name="SecondaryColor3uiv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3uiv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLuint *" count="3"/>
         <glx rop="4133"/>
     </function>
 
-    <function name="SecondaryColor3us" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3us" deprecated="3.1" exec="beginend">
         <param name="red" type="GLushort"/>
         <param name="green" type="GLushort"/>
         <param name="blue" type="GLushort"/>
     </function>
 
-    <function name="SecondaryColor3usv" deprecated="3.1" exec="vtxfmt">
+    <function name="SecondaryColor3usv" deprecated="3.1" exec="beginend">
         <param name="v" type="const GLushort *" count="3"/>
         <glx rop="4132"/>
     </function>
@@ -5702,11 +5702,11 @@
         <glx ignore="true"/>
     </function>
 
-    <function name="VertexAttrib1d" exec="vtxfmt">
+    <function name="VertexAttrib1d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib1dv" exec="vtxfmt">
+    <function name="VertexAttrib1dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="1"/>
         <glx rop="4197" doubles_in_order="true"/>
@@ -5719,22 +5719,22 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib1s" exec="vtxfmt">
+    <function name="VertexAttrib1s" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
     </function>
-    <function name="VertexAttrib1sv" exec="vtxfmt">
+    <function name="VertexAttrib1sv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="1"/>
         <glx rop="4189"/>
     </function>
 
-    <function name="VertexAttrib2d" exec="vtxfmt">
+    <function name="VertexAttrib2d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib2dv" exec="vtxfmt">
+    <function name="VertexAttrib2dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="4198" doubles_in_order="true"/>
@@ -5748,24 +5748,24 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib2s" exec="vtxfmt">
+    <function name="VertexAttrib2s" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
-    <function name="VertexAttrib2sv" exec="vtxfmt">
+    <function name="VertexAttrib2sv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="4190"/>
     </function>
 
-    <function name="VertexAttrib3d" exec="vtxfmt">
+    <function name="VertexAttrib3d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib3dv" exec="vtxfmt">
+    <function name="VertexAttrib3dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="4199" doubles_in_order="true"/>
@@ -5780,68 +5780,68 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib3s" exec="vtxfmt">
+    <function name="VertexAttrib3s" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
     </function>
-    <function name="VertexAttrib3sv" exec="vtxfmt">
+    <function name="VertexAttrib3sv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="4191"/>
     </function>
 
-    <function name="VertexAttrib4Nbv" exec="vtxfmt">
+    <function name="VertexAttrib4Nbv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLbyte *" count="4"/>
         <glx rop="4235"/>
     </function>
-    <function name="VertexAttrib4Niv" exec="vtxfmt">
+    <function name="VertexAttrib4Niv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="4237"/>
     </function>
-    <function name="VertexAttrib4Nsv" exec="vtxfmt">
+    <function name="VertexAttrib4Nsv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="4236"/>
     </function>
-    <function name="VertexAttrib4Nub" exec="vtxfmt">
+    <function name="VertexAttrib4Nub" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLubyte"/>
         <param name="y" type="GLubyte"/>
         <param name="z" type="GLubyte"/>
         <param name="w" type="GLubyte"/>
     </function>
-    <function name="VertexAttrib4Nubv" exec="vtxfmt">
+    <function name="VertexAttrib4Nubv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLubyte *" count="4"/>
         <glx rop="4201"/>
     </function>
-    <function name="VertexAttrib4Nuiv" exec="vtxfmt">
+    <function name="VertexAttrib4Nuiv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *" count="4"/>
         <glx rop="4239"/>
     </function>
-    <function name="VertexAttrib4Nusv" exec="vtxfmt">
+    <function name="VertexAttrib4Nusv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLushort *" count="4"/>
         <glx rop="4238"/>
     </function>
-    <function name="VertexAttrib4bv" exec="vtxfmt">
+    <function name="VertexAttrib4bv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLbyte *" count="4"/>
         <glx rop="4230"/>
     </function>
-    <function name="VertexAttrib4d" exec="vtxfmt">
+    <function name="VertexAttrib4d" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
         <param name="z" type="GLdouble"/>
         <param name="w" type="GLdouble"/>
     </function>
-    <function name="VertexAttrib4dv" exec="vtxfmt">
+    <function name="VertexAttrib4dv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="4200" doubles_in_order="true"/>
@@ -5857,34 +5857,34 @@
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *"/>
     </function>
-    <function name="VertexAttrib4iv" exec="vtxfmt">
+    <function name="VertexAttrib4iv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLint *" count="4"/>
         <glx rop="4231"/>
     </function>
-    <function name="VertexAttrib4s" exec="vtxfmt">
+    <function name="VertexAttrib4s" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
         <param name="z" type="GLshort"/>
         <param name="w" type="GLshort"/>
     </function>
-    <function name="VertexAttrib4sv" exec="vtxfmt">
+    <function name="VertexAttrib4sv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="4192"/>
     </function>
-    <function name="VertexAttrib4ubv" exec="vtxfmt">
+    <function name="VertexAttrib4ubv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLubyte *" count="4"/>
         <glx rop="4232"/>
     </function>
-    <function name="VertexAttrib4uiv" exec="vtxfmt">
+    <function name="VertexAttrib4uiv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLuint *" count="4"/>
         <glx rop="4234"/>
     </function>
-    <function name="VertexAttrib4usv" exec="vtxfmt">
+    <function name="VertexAttrib4usv" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLushort *" count="4"/>
         <glx rop="4233"/>
@@ -6044,12 +6044,12 @@
     </function>
 
     <function name="MultiTexCoord1fARB"
-              vectorequiv="MultiTexCoord1fvARB" exec="vtxfmt">
+              vectorequiv="MultiTexCoord1fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord1fvARB" exec="vtxfmt">
+    <function name="MultiTexCoord1fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="199"/>
@@ -6090,13 +6090,13 @@
     </function>
 
     <function name="MultiTexCoord2fARB"
-              vectorequiv="MultiTexCoord2fvARB" exec="vtxfmt">
+              vectorequiv="MultiTexCoord2fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord2fvARB" exec="vtxfmt">
+    <function name="MultiTexCoord2fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="203"/>
@@ -6140,14 +6140,14 @@
     </function>
 
     <function name="MultiTexCoord3fARB"
-              vectorequiv="MultiTexCoord3fvARB" exec="vtxfmt">
+              vectorequiv="MultiTexCoord3fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
         <param name="r" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord3fvARB" exec="vtxfmt">
+    <function name="MultiTexCoord3fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="207"/>
@@ -6194,7 +6194,7 @@
     </function>
 
     <function name="MultiTexCoord4fARB"
-              vectorequiv="MultiTexCoord4fvARB" exec="vtxfmt">
+              vectorequiv="MultiTexCoord4fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="s" type="GLfloat"/>
         <param name="t" type="GLfloat"/>
@@ -6202,7 +6202,7 @@
         <param name="q" type="GLfloat"/>
     </function>
 
-    <function name="MultiTexCoord4fvARB" exec="vtxfmt">
+    <function name="MultiTexCoord4fvARB" exec="beginend">
         <param name="target" type="GLenum"/>
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="211"/>
@@ -7071,12 +7071,12 @@
     </function>
 
     <function name="VertexAttrib1fARB"
-	      vectorequiv="VertexAttrib1fvARB" exec="vtxfmt">
+	      vectorequiv="VertexAttrib1fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib1fvARB" exec="vtxfmt">
+    <function name="VertexAttrib1fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="4193"/>
@@ -7106,13 +7106,13 @@
     </function>
 
     <function name="VertexAttrib2fARB"
-              vectorequiv="VertexAttrib2fvARB" exec="vtxfmt">
+              vectorequiv="VertexAttrib2fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib2fvARB" exec="vtxfmt">
+    <function name="VertexAttrib2fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="4194"/>
@@ -7144,14 +7144,14 @@
     </function>
 
     <function name="VertexAttrib3fARB"
-              vectorequiv="VertexAttrib3fvARB" exec="vtxfmt">
+              vectorequiv="VertexAttrib3fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib3fvARB" exec="vtxfmt">
+    <function name="VertexAttrib3fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="4195"/>
@@ -7185,7 +7185,7 @@
     </function>
 
     <function name="VertexAttrib4fARB"
-              vectorequiv="VertexAttrib4fvARB" exec="vtxfmt">
+              vectorequiv="VertexAttrib4fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
@@ -7193,7 +7193,7 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib4fvARB" exec="vtxfmt">
+    <function name="VertexAttrib4fvARB" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="4196"/>
@@ -9871,11 +9871,11 @@
 </category>
 
 <category name="GL_EXT_fog_coord" number="149">
-    <function name="FogCoordfEXT" vectorequiv="FogCoordfvEXT" exec="vtxfmt">
+    <function name="FogCoordfEXT" vectorequiv="FogCoordfvEXT" exec="beginend">
         <param name="coord" type="GLfloat"/>
     </function>
 
-    <function name="FogCoordfvEXT" exec="vtxfmt">
+    <function name="FogCoordfvEXT" exec="beginend">
         <param name="coord" type="const GLfloat *" count="1"/>
         <glx rop="4124"/>
     </function>
@@ -11567,32 +11567,32 @@
         <glx handcode="true"/>
     </function>
 
-    <function name="VertexAttrib1sNV" exec="vtxfmt"
+    <function name="VertexAttrib1sNV" exec="beginend"
               vectorequiv="VertexAttrib1svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib1svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib1svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="1"/>
         <glx rop="4265"/>
     </function>
 
-    <function name="VertexAttrib2sNV" exec="vtxfmt"
+    <function name="VertexAttrib2sNV" exec="beginend"
               vectorequiv="VertexAttrib2svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
         <param name="y" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib2svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib2svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="2"/>
         <glx rop="4266"/>
     </function>
 
-    <function name="VertexAttrib3sNV" exec="vtxfmt"
+    <function name="VertexAttrib3sNV" exec="beginend"
               vectorequiv="VertexAttrib3svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
@@ -11600,13 +11600,13 @@
         <param name="z" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib3svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib3svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="3"/>
         <glx rop="4267"/>
     </function>
 
-    <function name="VertexAttrib4sNV" exec="vtxfmt"
+    <function name="VertexAttrib4sNV" exec="beginend"
               vectorequiv="VertexAttrib4svNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLshort"/>
@@ -11615,53 +11615,53 @@
         <param name="w" type="GLshort"/>
     </function>
 
-    <function name="VertexAttrib4svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib4svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLshort *" count="4"/>
         <glx rop="4268"/>
     </function>
 
     <function name="VertexAttrib1fNV"
-              vectorequiv="VertexAttrib1fvNV" deprecated="3.1" exec="vtxfmt">
+              vectorequiv="VertexAttrib1fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib1fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib1fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="1"/>
         <glx rop="4269"/>
     </function>
 
     <function name="VertexAttrib2fNV"
-              vectorequiv="VertexAttrib2fvNV" deprecated="3.1" exec="vtxfmt">
+              vectorequiv="VertexAttrib2fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib2fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib2fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="2"/>
         <glx rop="4270"/>
     </function>
 
     <function name="VertexAttrib3fNV"
-              vectorequiv="VertexAttrib3fvNV" deprecated="3.1" exec="vtxfmt">
+              vectorequiv="VertexAttrib3fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
         <param name="z" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib3fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib3fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="3"/>
         <glx rop="4271"/>
     </function>
 
     <function name="VertexAttrib4fNV"
-              vectorequiv="VertexAttrib4fvNV" deprecated="3.1" exec="vtxfmt">
+              vectorequiv="VertexAttrib4fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLfloat"/>
         <param name="y" type="GLfloat"/>
@@ -11669,38 +11669,38 @@
         <param name="w" type="GLfloat"/>
     </function>
 
-    <function name="VertexAttrib4fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib4fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLfloat *" count="4"/>
         <glx rop="4272"/>
     </function>
 
-    <function name="VertexAttrib1dNV" exec="vtxfmt"
+    <function name="VertexAttrib1dNV" exec="beginend"
               vectorequiv="VertexAttrib1dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib1dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib1dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="1"/>
         <glx rop="4273" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttrib2dNV" exec="vtxfmt"
+    <function name="VertexAttrib2dNV" exec="beginend"
               vectorequiv="VertexAttrib2dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
         <param name="y" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib2dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib2dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="2"/>
         <glx rop="4274" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttrib3dNV" exec="vtxfmt"
+    <function name="VertexAttrib3dNV" exec="beginend"
               vectorequiv="VertexAttrib3dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
@@ -11708,13 +11708,13 @@
         <param name="z" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib3dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib3dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="3"/>
         <glx rop="4275" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttrib4dNV" exec="vtxfmt"
+    <function name="VertexAttrib4dNV" exec="beginend"
               vectorequiv="VertexAttrib4dvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLdouble"/>
@@ -11723,13 +11723,13 @@
         <param name="w" type="GLdouble"/>
     </function>
 
-    <function name="VertexAttrib4dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib4dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLdouble *" count="4"/>
         <glx rop="4276" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttrib4ubNV" exec="vtxfmt"
+    <function name="VertexAttrib4ubNV" exec="beginend"
               vectorequiv="VertexAttrib4ubvNV" deprecated="3.1">
         <param name="index" type="GLuint"/>
         <param name="x" type="GLubyte"/>
@@ -11738,97 +11738,97 @@
         <param name="w" type="GLubyte"/>
     </function>
 
-    <function name="VertexAttrib4ubvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttrib4ubvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="v" type="const GLubyte *" count="4"/>
         <glx rop="4277"/>
     </function>
 
-    <function name="VertexAttribs1svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs1svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n"/>
         <glx rop="4202"/>
     </function>
 
-    <function name="VertexAttribs2svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs2svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n" count_scale="2"/>
         <glx rop="4203"/>
     </function>
 
-    <function name="VertexAttribs3svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs3svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n" count_scale="3"/>
         <glx rop="4204"/>
     </function>
 
-    <function name="VertexAttribs4svNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs4svNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLshort *" count="n" count_scale="4"/>
         <glx rop="4205"/>
     </function>
 
-    <function name="VertexAttribs1fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs1fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n"/>
         <glx rop="4206"/>
     </function>
 
-    <function name="VertexAttribs2fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs2fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n" count_scale="2"/>
         <glx rop="4207"/>
     </function>
 
-    <function name="VertexAttribs3fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs3fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n" count_scale="3"/>
         <glx rop="4208"/>
     </function>
 
-    <function name="VertexAttribs4fvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs4fvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLfloat *" count="n" count_scale="4"/>
         <glx rop="4209"/>
     </function>
 
-    <function name="VertexAttribs1dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs1dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n"/>
         <glx rop="4210" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs2dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs2dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n" count_scale="2"/>
         <glx rop="4211" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs3dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs3dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n" count_scale="3"/>
         <glx rop="4212" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs4dvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs4dvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLdouble *" count="n" count_scale="4"/>
         <glx rop="4213" doubles_in_order="true"/>
     </function>
 
-    <function name="VertexAttribs4ubvNV" deprecated="3.1" exec="vtxfmt">
+    <function name="VertexAttribs4ubvNV" deprecated="3.1" exec="beginend">
         <param name="index" type="GLuint"/>
         <param name="n" type="GLsizei" counter="true"/>
         <param name="v" type="const GLubyte *" count="n" count_scale="4"/>
diff --git a/src/mapi/glapi/gen/meson.build b/src/mapi/glapi/gen/meson.build
index bc3761c5727..e70fd598310 100644
--- a/src/mapi/glapi/gen/meson.build
+++ b/src/mapi/glapi/gen/meson.build
@@ -253,10 +253,10 @@ main_api_save_h = custom_target(
   capture : true,
 )
 
-main_api_vtxfmt_init_h = custom_target(
-  'api_vtxfmt_init.h',
-  input : ['api_vtxfmt_init_h.py', 'gl_and_es_API.xml'],
-  output : 'api_vtxfmt_init.h',
+main_api_beginend_init_h = custom_target(
+  'api_beginend_init.h',
+  input : ['api_beginend_init_h.py', 'gl_and_es_API.xml'],
+  output : 'api_beginend_init.h',
   command : [prog_python, '@INPUT0@', '-f', '@INPUT1@'],
   depend_files : files('apiexec.py') + glapi_gen_depends,
   capture : true,
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index 27ec08a92bf..c78242bead9 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -14104,5 +14104,5 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx)
 #define NAME(x) save_##x
 #define NAME_ES(x) save_##x
 
-   #include "api_vtxfmt_init.h"
+   #include "api_beginend_init.h"
 }
diff --git a/src/mesa/meson.build b/src/mesa/meson.build
index 7c300bf9f50..6dc5844d1fa 100644
--- a/src/mesa/meson.build
+++ b/src/mesa/meson.build
@@ -447,7 +447,7 @@ files_libmesa += [
   main_api_exec_decl_h,
   main_api_save_h,
   main_api_save_init_h,
-  main_api_vtxfmt_init_h,
+  main_api_beginend_init_h,
   main_api_hw_select_init_h,
   main_enums_c,
   format_fallback_c,
diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c
index 1396e07dc10..421a7f983c0 100644
--- a/src/mesa/vbo/vbo_exec_api.c
+++ b/src/mesa/vbo/vbo_exec_api.c
@@ -1077,11 +1077,11 @@ vbo_install_exec_vtxfmt(struct gl_context *ctx)
 #define NAME_ES(x) _es_##x
 
    struct _glapi_table *tab = ctx->OutsideBeginEnd;
-   #include "api_vtxfmt_init.h"
+   #include "api_beginend_init.h"
 
    if (ctx->BeginEnd) {
       tab = ctx->BeginEnd;
-      #include "api_vtxfmt_init.h"
+      #include "api_beginend_init.h"
    }
 }
 
diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c
index 9ed773d3bc5..04d67242d72 100644
--- a/src/mesa/vbo/vbo_noop.c
+++ b/src/mesa/vbo/vbo_noop.c
@@ -128,16 +128,16 @@ vbo_install_exec_vtxfmt_noop(struct gl_context *ctx)
 #define NAME_ES(x) _mesa_noop_##x
 
    struct _glapi_table *tab = ctx->Exec;
-   #include "api_vtxfmt_init.h"
+   #include "api_beginend_init.h"
 
    if (ctx->BeginEnd) {
       tab = ctx->BeginEnd;
-      #include "api_vtxfmt_init.h"
+      #include "api_beginend_init.h"
    }
 
    if (ctx->HWSelectModeBeginEnd) {
       tab = ctx->HWSelectModeBeginEnd;
-      #include "api_vtxfmt_init.h"
+      #include "api_beginend_init.h"
    }
 }
 
@@ -146,7 +146,7 @@ void
 vbo_install_save_vtxfmt_noop(struct gl_context *ctx)
 {
    struct _glapi_table *tab = ctx->Save;
-   #include "api_vtxfmt_init.h"
+   #include "api_beginend_init.h"
 }
 
 /**
diff --git a/src/mesa/vbo/vbo_save_api.c b/src/mesa/vbo/vbo_save_api.c
index 5abc4174cab..4311bd53de9 100644
--- a/src/mesa/vbo/vbo_save_api.c
+++ b/src/mesa/vbo/vbo_save_api.c
@@ -1943,7 +1943,7 @@ vbo_install_save_vtxfmt(struct gl_context *ctx)
 #define NAME_ES(x) _save_##x
 
    struct _glapi_table *tab = ctx->Save;
-   #include "api_vtxfmt_init.h"
+   #include "api_beginend_init.h"
 }