From e62c4c765c6ff81807b460ad3a7009618ae6cb77 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 29 May 2012 12:23:36 -0700 Subject: [PATCH] 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 Reviewed-by: Brian Paul --- src/mapi/glapi/gen/gl_API.xml | 2 +- src/mapi/glapi/tests/check_table.cpp | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index e7bb0bade97..e0c5b8a301e 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -10020,7 +10020,7 @@ - + diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp index b2da94e5236..f1e73ed4a2b 100644 --- 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) }, -- 2.30.2