[Mesa-dev] [PATCH 21/26] glapi: Remove GL_SGIS_pixel_texture from the dispatch table

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

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 test is also updated.  The odd side effect here is the test
GetProcAddress::TableAsBigAsAt_git_b45052b now really has nothing to
do with GIT SHA1 b45052b.  This is why the new value is '978u - 6u'.
GIT SHA1 b45052b had 978 entries, and six are removed by this change.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 src/mapi/glapi/gen/gl_API.xml        |   12 ++++++------
 src/mapi/glapi/tests/check_table.cpp |   11 ++++-------
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index a482760..e7bb0ba 100644
--- 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 ecb9f4a..2ce2a3a 100644
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -76,8 +76,11 @@ TEST(GetProcAddress, TableAsBigAsAt_git_b45052b)
 
    /* The dispatch table is not expected to shrink.  Verify that the static
     * table is at least as big as it was at some arbitrary GIT SHA1.
+    *
+    * 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)
@@ -1237,12 +1240,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) },
-- 
1.7.6.5