glapi: Remove GL_SGIX_pixel_texture from the dispatch table

There is no GLX protocol for this function.  Open-source Linux driver
have not supported this extension for many years, and it seems
unlikely at this point that this support will return.  There's no
reason to have slots for this function 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 e7bb0bade976af9a7fb8307c6ea42a1570465934..e0c5b8a301e6aa8890fe368d00f3e0df660ccd45 100644 (file)
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -10020,7 +10020,7 @@
 </category>
 
 <category name="GL_SGIX_pixel_texture" number="160">
-    <function name="PixelTexGenSGIX" offset="assign" static_dispatch="false">
+    <function name="PixelTexGenSGIX">
         <param name="mode" type="GLenum"/>
         <glx rop="2059" ignore="true"/>
     </function>

diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index b2da94e5236b73bb7234c5602226e2616d2fe8e8..f1e73ed4a2b044f846782fcc72be6d6f5ffeead1 100644 (file)
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -84,8 +84,11 @@ TEST(GetProcAddress, TableDidntShrink)
     *
     * 6 entries were removed when GL_SGIS_pixel_texture was removed from the
     * dispatch table.
+    *
+    * 1 entry was removed when GL_SGIX_pixel_texture was removed from the
+    * dispatch table.
     */
-   EXPECT_GE(table_entries, 978u - 6u);
+   EXPECT_GE(table_entries, 978u - 6u - 1u);
 }
 
 TEST(GetProcAddress, QueriedDispatchSizeBigEnough)
@@ -1281,7 +1284,6 @@ const struct name_offset known_dispatch[] = {
    { "glFogCoorddvEXT", _O(FogCoorddvEXT) },
    { "glFogCoordfEXT", _O(FogCoordfEXT) },
    { "glFogCoordfvEXT", _O(FogCoordfvEXT) },
-   { "glPixelTexGenSGIX", _O(PixelTexGenSGIX) },
    { "glBlendFuncSeparateEXT", _O(BlendFuncSeparateEXT) },
    { "glFlushVertexArrayRangeNV", _O(FlushVertexArrayRangeNV) },
    { "glVertexArrayRangeNV", _O(VertexArrayRangeNV) },