mesa: remove Driver.DeleteArrayObject

Nothing reimplements it.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 85b53f40313644daebbe8613a5697a57482d4c8f..84d74dfda8a4b9860e090fd20a717424604ca41f 100644 (file)
--- a/src/mesa/drivers/common/driverfuncs.c
+++ b/src/mesa/drivers/common/driverfuncs.c
@@ -178,7 +178,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
    _mesa_init_texture_barrier_functions(driver);
 
    /* APPLE_vertex_array_object */
-   driver->DeleteArrayObject = _mesa_delete_vao;
    driver->BindArrayObject = NULL;
 
    _mesa_init_shader_object_functions(driver);

diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index dde489e85feb9ec91f434d981b4fd38dacb87f71..f72722140001a7acf48c1fe365a50b2792335ece 100644 (file)
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -202,10 +202,8 @@ _mesa_reference_vao_(struct gl_context *ctx,
       deleteFlag = (oldObj->RefCount == 0);
       mtx_unlock(&oldObj->Mutex);
 
-      if (deleteFlag) {
-        assert(ctx->Driver.DeleteArrayObject);
-         ctx->Driver.DeleteArrayObject(ctx, oldObj);
-      }
+      if (deleteFlag)
+         _mesa_delete_vao(ctx, oldObj);
 
       *ptr = NULL;
    }

diff --git a/src/mesa/main/dd.h b/src/mesa/main/dd.h
index 503ef4be27d7f82ea5a4f8ff090f091bd14ea47a..bbd26dee374d5351eaee71e8f551a8e62ac8c5d2 100644 (file)
--- a/src/mesa/main/dd.h
+++ b/src/mesa/main/dd.h
@@ -752,7 +752,6 @@ struct dd_function_table {
     * \name Vertex Array objects
     */
    /*@{*/
-   void (*DeleteArrayObject)(struct gl_context *ctx, struct gl_vertex_array_object *);
    void (*BindArrayObject)(struct gl_context *ctx, struct gl_vertex_array_object *);
    /*@}*/
 

diff --git a/src/mesa/state_tracker/st_cb_bufferobjects.c b/src/mesa/state_tracker/st_cb_bufferobjects.c
index bcfac980cb405181898ce13751740aa3dcc6cf14..8afd336779faf68a93f813d3bf3873909d11d7a4 100644 (file)
--- a/src/mesa/state_tracker/st_cb_bufferobjects.c
+++ b/src/mesa/state_tracker/st_cb_bufferobjects.c
@@ -527,7 +527,4 @@ st_init_bufferobject_functions(struct dd_function_table *functions)
    functions->UnmapBuffer = st_bufferobj_unmap;
    functions->CopyBufferSubData = st_copy_buffer_subdata;
    functions->ClearBufferSubData = st_clear_buffer_subdata;
-
-   /* For GL_APPLE_vertex_array_object */
-   functions->DeleteArrayObject = _mesa_delete_vao;
 }