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>
This commit is contained in:
Ian Romanick 2012-05-29 12:15:11 -07:00
parent a29ad2b421
commit 933714aabe
2 changed files with 10 additions and 13 deletions

View File

@ -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"/>

View File

@ -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) },