diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index bd751052a4b..aef4d82f78c 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -11005,43 +11005,43 @@
 </category>
 
 <category name="GL_NV_fence" number="222">
-    <function name="DeleteFencesNV" offset="assign" static_dispatch="false">
+    <function name="DeleteFencesNV">
         <param name="n" type="GLsizei"/>
         <param name="fences" type="const GLuint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GenFencesNV" offset="assign" static_dispatch="false">
+    <function name="GenFencesNV">
         <param name="n" type="GLsizei" counter="true"/>
         <param name="fences" type="GLuint *" output="true" count="n"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="IsFenceNV" offset="assign" static_dispatch="false">
+    <function name="IsFenceNV">
         <param name="fence" type="GLuint"/>
         <return type="GLboolean"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="TestFenceNV" offset="assign" static_dispatch="false">
+    <function name="TestFenceNV">
         <param name="fence" type="GLuint"/>
         <return type="GLboolean"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetFenceivNV" offset="assign" static_dispatch="false">
+    <function name="GetFenceivNV">
         <param name="fence" type="GLuint"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="FinishFenceNV" offset="assign" static_dispatch="false">
+    <function name="FinishFenceNV">
         <param name="fence" type="GLuint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="SetFenceNV" offset="assign" static_dispatch="false">
+    <function name="SetFenceNV">
         <param name="fence" type="GLuint"/>
         <param name="condition" type="GLenum"/>
         <glx ignore="true"/>
diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index 7471c8cc015..c01de37c925 100644
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -93,8 +93,11 @@ TEST(GetProcAddress, TableDidntShrink)
     *
     * 13 entries were removed when GL_NV_register_combiners was removed from
     * the dispatch table.
+    *
+    * 7 entries were removed when GL_NV_fence was removed from the dispatch
+    * table.
     */
-   EXPECT_GE(table_entries, 978u - 6u - 1u - 2u - 13u);
+   EXPECT_GE(table_entries, 978u - 6u - 1u - 2u - 13u - 7u);
 }
 
 TEST(GetProcAddress, QueriedDispatchSizeBigEnough)
@@ -1320,13 +1323,6 @@ const struct name_offset known_dispatch[] = {
    { "glWindowPos4svMESA", _O(WindowPos4svMESA) },
    { "glMultiModeDrawArraysIBM", _O(MultiModeDrawArraysIBM) },
    { "glMultiModeDrawElementsIBM", _O(MultiModeDrawElementsIBM) },
-   { "glDeleteFencesNV", _O(DeleteFencesNV) },
-   { "glFinishFenceNV", _O(FinishFenceNV) },
-   { "glGenFencesNV", _O(GenFencesNV) },
-   { "glGetFenceivNV", _O(GetFenceivNV) },
-   { "glIsFenceNV", _O(IsFenceNV) },
-   { "glSetFenceNV", _O(SetFenceNV) },
-   { "glTestFenceNV", _O(TestFenceNV) },
    { "glAreProgramsResidentNV", _O(AreProgramsResidentNV) },
    { "glBindProgramNV", _O(BindProgramNV) },
    { "glDeleteProgramsNV", _O(DeleteProgramsNV) },