From: Ian Romanick <[email protected]> There is no GLX protocol for these functions. No open-source Linux driver has ever supported this extension, and it seems unlikely at this point that one ever will. 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 - 13u'. GIT SHA1 b45052b had 978 entries, and thirteen are removed by this change. Signed-off-by: Ian Romanick <[email protected]> --- src/mapi/glapi/gen/gl_API.xml | 26 +++++++++++++------------- src/mapi/glapi/tests/check_table.cpp | 18 ++++-------------- 2 files changed, 17 insertions(+), 27 deletions(-) diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index 97056b5..bd75105 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -10551,31 +10551,31 @@ </category> <category name="GL_NV_register_combiners" number="191"> - <function name="CombinerParameterfvNV" offset="assign"> + <function name="CombinerParameterfvNV"> <param name="pname" type="GLenum"/> <param name="params" type="const GLfloat *" variable_param="pname"/> <glx rop="4137" ignore="true"/> </function> - <function name="CombinerParameterfNV" offset="assign"> + <function name="CombinerParameterfNV"> <param name="pname" type="GLenum"/> <param name="param" type="GLfloat"/> <glx rop="4136" ignore="true"/> </function> - <function name="CombinerParameterivNV" offset="assign"> + <function name="CombinerParameterivNV"> <param name="pname" type="GLenum"/> <param name="params" type="const GLint *" variable_param="pname"/> <glx rop="4139" ignore="true"/> </function> - <function name="CombinerParameteriNV" offset="assign"> + <function name="CombinerParameteriNV"> <param name="pname" type="GLenum"/> <param name="param" type="GLint"/> <glx rop="4138" ignore="true"/> </function> - <function name="CombinerInputNV" offset="assign"> + <function name="CombinerInputNV"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10585,7 +10585,7 @@ <glx rop="4140" ignore="true"/> </function> - <function name="CombinerOutputNV" offset="assign"> + <function name="CombinerOutputNV"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="abOutput" type="GLenum"/> @@ -10599,7 +10599,7 @@ <glx rop="4141" ignore="true"/> </function> - <function name="FinalCombinerInputNV" offset="assign"> + <function name="FinalCombinerInputNV"> <param name="variable" type="GLenum"/> <param name="input" type="GLenum"/> <param name="mapping" type="GLenum"/> @@ -10607,7 +10607,7 @@ <glx rop="4142" ignore="true"/> </function> - <function name="GetCombinerInputParameterfvNV" offset="assign"> + <function name="GetCombinerInputParameterfvNV"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10616,7 +10616,7 @@ <glx vendorpriv="1270" ignore="true"/> </function> - <function name="GetCombinerInputParameterivNV" offset="assign"> + <function name="GetCombinerInputParameterivNV"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="variable" type="GLenum"/> @@ -10625,7 +10625,7 @@ <glx vendorpriv="1271" ignore="true"/> </function> - <function name="GetCombinerOutputParameterfvNV" offset="assign"> + <function name="GetCombinerOutputParameterfvNV"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="pname" type="GLenum"/> @@ -10633,7 +10633,7 @@ <glx vendorpriv="1272" ignore="true"/> </function> - <function name="GetCombinerOutputParameterivNV" offset="assign"> + <function name="GetCombinerOutputParameterivNV"> <param name="stage" type="GLenum"/> <param name="portion" type="GLenum"/> <param name="pname" type="GLenum"/> @@ -10641,14 +10641,14 @@ <glx vendorpriv="1273" ignore="true"/> </function> - <function name="GetFinalCombinerInputParameterfvNV" offset="assign"> + <function name="GetFinalCombinerInputParameterfvNV"> <param name="variable" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLfloat *" output="true"/> <glx vendorpriv="1274" ignore="true"/> </function> - <function name="GetFinalCombinerInputParameterivNV" offset="assign"> + <function name="GetFinalCombinerInputParameterivNV"> <param name="variable" type="GLenum"/> <param name="pname" type="GLenum"/> <param name="params" type="GLint *" output="true"/> diff --git a/src/mapi/glapi/tests/check_table.cpp b/src/mapi/glapi/tests/check_table.cpp index c4627f8..db2b583 100644 --- a/src/mapi/glapi/tests/check_table.cpp +++ b/src/mapi/glapi/tests/check_table.cpp @@ -85,8 +85,11 @@ TEST(GetProcAddress, TableAsBigAsAt_git_b45052b) * * 2 entries were removed when GL_APPLE_texture_range was removed from the * dispatch table. + * + * 13 entries were removed when GL_NV_register_combiners was removed from + * the dispatch table. */ - EXPECT_GE(table_entries, 978u - 6u - 1u - 2u); + EXPECT_GE(table_entries, 978u - 6u - 1u - 2u - 13u); } TEST(GetProcAddress, QueriedDispatchSizeBigEnough) @@ -1285,19 +1288,6 @@ const struct name_offset known_dispatch[] = { { "glBlendFuncSeparateEXT", _O(BlendFuncSeparateEXT) }, { "glFlushVertexArrayRangeNV", _O(FlushVertexArrayRangeNV) }, { "glVertexArrayRangeNV", _O(VertexArrayRangeNV) }, - { "glCombinerInputNV", _O(CombinerInputNV) }, - { "glCombinerOutputNV", _O(CombinerOutputNV) }, - { "glCombinerParameterfNV", _O(CombinerParameterfNV) }, - { "glCombinerParameterfvNV", _O(CombinerParameterfvNV) }, - { "glCombinerParameteriNV", _O(CombinerParameteriNV) }, - { "glCombinerParameterivNV", _O(CombinerParameterivNV) }, - { "glFinalCombinerInputNV", _O(FinalCombinerInputNV) }, - { "glGetCombinerInputParameterfvNV", _O(GetCombinerInputParameterfvNV) }, - { "glGetCombinerInputParameterivNV", _O(GetCombinerInputParameterivNV) }, - { "glGetCombinerOutputParameterfvNV", _O(GetCombinerOutputParameterfvNV) }, - { "glGetCombinerOutputParameterivNV", _O(GetCombinerOutputParameterivNV) }, - { "glGetFinalCombinerInputParameterfvNV", _O(GetFinalCombinerInputParameterfvNV) }, - { "glGetFinalCombinerInputParameterivNV", _O(GetFinalCombinerInputParameterivNV) }, { "glResizeBuffersMESA", _O(ResizeBuffersMESA) }, { "glWindowPos2dMESA", _O(WindowPos2dMESA) }, { "glWindowPos2dvMESA", _O(WindowPos2dvMESA) }, -- 1.7.6.5 _______________________________________________ mesa-dev mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-dev
