diff options
-rw-r--r-- | src/mapi/glapi/gen/APPLE_vertex_array_object.xml | 8 | ||||
-rw-r--r-- | src/mesa/main/arrayobj.c | 16 | ||||
-rw-r--r-- | src/mesa/main/arrayobj.h | 4 | ||||
-rw-r--r-- | src/mesa/main/tests/dispatch_sanity.cpp | 2 |
4 files changed, 4 insertions, 26 deletions
diff --git a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml index 7312f9b35f0..daf6990ea8a 100644 --- a/src/mapi/glapi/gen/APPLE_vertex_array_object.xml +++ b/src/mapi/glapi/gen/APPLE_vertex_array_object.xml @@ -5,21 +5,21 @@ <category name="GL_APPLE_vertex_array_object" number="273"> <enum name="VERTEX_ARRAY_BINDING_APPLE" value="0x85B5"/> - <function name="BindVertexArrayAPPLE" deprecated="3.1"> + <function name="BindVertexArrayAPPLE" deprecated="3.1" exec="skip"> <param name="array" type="GLuint"/> </function> - <function name="DeleteVertexArraysAPPLE" alias="DeleteVertexArrays"> + <function name="DeleteVertexArraysAPPLE" exec="skip"> <param name="n" type="GLsizei"/> <param name="arrays" type="const GLuint *"/> </function> - <function name="GenVertexArraysAPPLE" deprecated="3.1"> + <function name="GenVertexArraysAPPLE" deprecated="3.1" exec="skip"> <param name="n" type="GLsizei"/> <param name="arrays" type="GLuint *" count="n" output="true"/> </function> - <function name="IsVertexArrayAPPLE" alias="IsVertexArray"> + <function name="IsVertexArrayAPPLE" exec="skip"> <param name="array" type="GLuint"/> <return type="GLboolean"/> </function> diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c index b98622932c5..82c00fbe826 100644 --- a/src/mesa/main/arrayobj.c +++ b/src/mesa/main/arrayobj.c @@ -473,14 +473,6 @@ _mesa_BindVertexArray( GLuint id ) } -void GLAPIENTRY -_mesa_BindVertexArrayAPPLE(GLuint id) -{ - GET_CURRENT_CONTEXT(ctx); - _mesa_problem(ctx, "APPLE_vertex_array_object is not supported!"); -} - - /** * Delete a set of array objects. * @@ -587,14 +579,6 @@ _mesa_GenVertexArrays(GLsizei n, GLuint *arrays) } -void GLAPIENTRY -_mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *arrays) -{ - GET_CURRENT_CONTEXT(ctx); - _mesa_problem(ctx, "APPLE_vertex_array_object is not supported!"); -} - - /** * ARB_direct_state_access * Generates ID's and creates the array objects. diff --git a/src/mesa/main/arrayobj.h b/src/mesa/main/arrayobj.h index 097027ba97c..17949685775 100644 --- a/src/mesa/main/arrayobj.h +++ b/src/mesa/main/arrayobj.h @@ -96,14 +96,10 @@ _mesa_all_buffers_are_unmapped(const struct gl_vertex_array_object *vao); void GLAPIENTRY _mesa_BindVertexArray( GLuint id ); -void GLAPIENTRY _mesa_BindVertexArrayAPPLE(GLuint id); - void GLAPIENTRY _mesa_DeleteVertexArrays(GLsizei n, const GLuint *ids); void GLAPIENTRY _mesa_GenVertexArrays(GLsizei n, GLuint *arrays); -void GLAPIENTRY _mesa_GenVertexArraysAPPLE(GLsizei n, GLuint *buffer); - void GLAPIENTRY _mesa_CreateVertexArrays(GLsizei n, GLuint *arrays); GLboolean GLAPIENTRY _mesa_IsVertexArray( GLuint id ); diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp index 12a9ee7bae1..b33043ed28b 100644 --- a/src/mesa/main/tests/dispatch_sanity.cpp +++ b/src/mesa/main/tests/dispatch_sanity.cpp @@ -969,8 +969,6 @@ const struct function common_desktop_functions_possible[] = { }; const struct function gl_compatibility_functions_possible[] = { - { "glBindVertexArrayAPPLE", 10, -1 }, - { "glGenVertexArraysAPPLE", 10, -1 }, { "glBindRenderbufferEXT", 10, -1 }, { "glBindFramebufferEXT", 10, -1 }, { "glNewList", 10, _gloffset_NewList }, |