glapi: Remove GL_SGIS_pixel_texture from the dispatch table

There is no GLX protocol for these functions, and no Linux driver has
ever supported this extension.  There's no reason to have slots for
these functions in the dispatch table.

The unit tests (GetProcAddress::TableDidntShrink and others) are also updated.

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index a4827600b1858511889350e810ae976749fbb1c5..e7bb0bade976af9a7fb8307c6ea42a1570465934 100644 (file)
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -8619,37 +8619,37 @@
 </category>
 
 <category name="GL_SGIS_pixel_texture" number="15">
-    <function name="PixelTexGenParameteriSGIS" offset="assign" static_dispatch="false">
+    <function name="PixelTexGenParameteriSGIS">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLint"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="PixelTexGenParameterivSGIS" offset="assign" static_dispatch="false">
+    <function name="PixelTexGenParameterivSGIS">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLint *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="PixelTexGenParameterfSGIS" offset="assign" static_dispatch="false">
+    <function name="PixelTexGenParameterfSGIS">
         <param name="pname" type="GLenum"/>
         <param name="param" type="GLfloat"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="PixelTexGenParameterfvSGIS" offset="assign" static_dispatch="false">
+    <function name="PixelTexGenParameterfvSGIS">
         <param name="pname" type="GLenum"/>
         <param name="params" type="const GLfloat *"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetPixelTexGenParameterivSGIS" offset="assign" static_dispatch="false">
+    <function name="GetPixelTexGenParameterivSGIS">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLint *" output="true" variable_param="pname"/>
         <glx ignore="true"/>
     </function>
 
-    <function name="GetPixelTexGenParameterfvSGIS" offset="assign" static_dispatch="false">
+    <function name="GetPixelTexGenParameterfvSGIS">
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLfloat *" output="true" variable_param="pname"/>
         <glx ignore="true"/>

diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index 492587b131b8064e5f9cba22882bd48a87589fb2..b2da94e5236b73bb7234c5602226e2616d2fe8e8 100644 (file)
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -81,8 +81,11 @@ TEST(GetProcAddress, TableDidntShrink)
     *
     * Changes that accidentally reduce the size of the table are bugs, and
     * they should be fixed.
+    *
+    * 6 entries were removed when GL_SGIS_pixel_texture was removed from the
+    * dispatch table.
     */
-   EXPECT_GE(table_entries, 978u);
+   EXPECT_GE(table_entries, 978u - 6u);
 }
 
 TEST(GetProcAddress, QueriedDispatchSizeBigEnough)
@@ -1242,12 +1245,6 @@ const struct name_offset known_dispatch[] = {
    { "glTextureStorage2DEXT", _O(TextureStorage2DEXT) },
    { "glTextureStorage3DEXT", _O(TextureStorage3DEXT) },
    { "glPolygonOffsetEXT", _O(PolygonOffsetEXT) },
-   { "glGetPixelTexGenParameterfvSGIS", _O(GetPixelTexGenParameterfvSGIS) },
-   { "glGetPixelTexGenParameterivSGIS", _O(GetPixelTexGenParameterivSGIS) },
-   { "glPixelTexGenParameterfSGIS", _O(PixelTexGenParameterfSGIS) },
-   { "glPixelTexGenParameterfvSGIS", _O(PixelTexGenParameterfvSGIS) },
-   { "glPixelTexGenParameteriSGIS", _O(PixelTexGenParameteriSGIS) },
-   { "glPixelTexGenParameterivSGIS", _O(PixelTexGenParameterivSGIS) },
    { "glSampleMaskSGIS", _O(SampleMaskSGIS) },
    { "glSamplePatternSGIS", _O(SamplePatternSGIS) },
    { "glColorPointerEXT", _O(ColorPointerEXT) },