From: Ian Romanick <[email protected]> There is no GLX protocol for this 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 - 1u'. GIT SHA1 b45052b had 978 entries, and one is removed by this change. Signed-off-by: Ian Romanick <[email protected]> --- 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 e7bb0ba..e0c5b8a 100644 --- 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 2ce2a3a..d35dd3d 100644 --- a/src/mapi/glapi/tests/check_table.cpp +++ b/src/mapi/glapi/tests/check_table.cpp @@ -79,8 +79,11 @@ TEST(GetProcAddress, TableAsBigAsAt_git_b45052b) * * 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) @@ -1276,7 +1279,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) }, -- 1.7.6.5 _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
