[Mesa-dev] [PATCH 12/23] mesa: remove Driver.DeleteArrayObject

[Marek Olšák]

From: Marek Olšák <marek.olsak at amd.com>

Nothing reimplements it.
---
 src/mesa/drivers/common/driverfuncs.c        | 1 -
 src/mesa/main/arrayobj.c                     | 6 ++----
 src/mesa/main/dd.h                           | 1 -
 src/mesa/state_tracker/st_cb_bufferobjects.c | 3 ---
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/mesa/drivers/common/driverfuncs.c b/src/mesa/drivers/common/driverfuncs.c
index 85b53f4..84d74df 100644
--- 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 dde489e..f727221 100644
--- 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 4266ffd..d85b170 100644
--- 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 bcfac98..8afd336 100644
--- 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;
 }
-- 
2.1.4