glapi: Remove GL_APPLE_texture_range 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 e0c5b8a301e6aa8890fe368d00f3e0df660ccd45..97056b5ae96e809db2607c361fefc8160d887253 100644 (file)
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -12410,12 +12410,12 @@
     <enum name="TEXTURE_RANGE_POINTER_APPLE" count="1" value="0x85B8">
         <size name="GetTexParameterPointervAPPLE" mode="get"/>
     </enum>
-    <function name="TextureRangeAPPLE" offset="assign" static_dispatch="false">
+    <function name="TextureRangeAPPLE">
         <param name="target" type="GLenum"/>
         <param name="length" type="GLsizei"/>
         <param name="pointer" type="GLvoid *"/>
     </function>
-    <function name="GetTexParameterPointervAPPLE" offset="assign" static_dispatch="false">
+    <function name="GetTexParameterPointervAPPLE">
         <param name="target" type="GLenum"/>
         <param name="pname" type="GLenum"/>
         <param name="params" type="GLvoid **"/>

diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp
index f1e73ed4a2b044f846782fcc72be6d6f5ffeead1..28ac3a41bac1210304aaee82a92acdd0b096511d 100644 (file)
--- a/src/mapi/glapi/tests/check_table.cpp
+++ b/src/mapi/glapi/tests/check_table.cpp
@@ -87,8 +87,11 @@ TEST(GetProcAddress, TableDidntShrink)
     *
     * 1 entry was removed when GL_SGIX_pixel_texture was removed from the
     * dispatch table.
+    *
+    * 2 entries were removed when GL_APPLE_texture_range was removed from the
+    * dispatch table.
     */
-   EXPECT_GE(table_entries, 978u - 6u - 1u);
+   EXPECT_GE(table_entries, 978u - 6u - 1u - 2u);
 }
 
 TEST(GetProcAddress, QueriedDispatchSizeBigEnough)
@@ -1506,8 +1509,6 @@ const struct name_offset known_dispatch[] = {
    { "glGetTransformFeedbackVaryingEXT", _O(GetTransformFeedbackVaryingEXT) },
    { "glTransformFeedbackVaryingsEXT", _O(TransformFeedbackVaryingsEXT) },
    { "glProvokingVertexEXT", _O(ProvokingVertexEXT) },
-   { "glGetTexParameterPointervAPPLE", _O(GetTexParameterPointervAPPLE) },
-   { "glTextureRangeAPPLE", _O(TextureRangeAPPLE) },
    { "glGetObjectParameterivAPPLE", _O(GetObjectParameterivAPPLE) },
    { "glObjectPurgeableAPPLE", _O(ObjectPurgeableAPPLE) },
    { "glObjectUnpurgeableAPPLE", _O(ObjectUnpurgeableAPPLE) },