OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa: remove Driver.DeleteArrayObject

Browse Source 
Nothing reimplements it.

Reviewed-by: Brian Paul <brianp@vmware.com>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Marek Olšák
2015-09-27 21:28:22 +02:00
parent 7401807e8d
commit d1269a844f
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/mesa/drivers/common/driverfuncs.c
View File

@@ -178,7 +178,6 @@ _mesa_init_driver_functions(struct dd_function_table *driver)
_mesa_init_texture_barrier_functions(driver); _mesa_init_texture_barrier_functions(driver);
/* APPLE_vertex_array_object */ /* APPLE_vertex_array_object */
driver->DeleteArrayObject = _mesa_delete_vao;
driver->BindArrayObject = NULL; driver->BindArrayObject = NULL;
_mesa_init_shader_object_functions(driver); _mesa_init_shader_object_functions(driver);

6
src/mesa/main/arrayobj.c
View File

@@ -202,10 +202,8 @@ _mesa_reference_vao_(struct gl_context *ctx,
deleteFlag = (oldObj->RefCount == 0); deleteFlag = (oldObj->RefCount == 0);
mtx_unlock(&oldObj->Mutex); mtx_unlock(&oldObj->Mutex);
if (deleteFlag) { if (deleteFlag)
assert(ctx->Driver.DeleteArrayObject); _mesa_delete_vao(ctx, oldObj);
ctx->Driver.DeleteArrayObject(ctx, oldObj);
}
*ptr = NULL; *ptr = NULL;
} }

1
src/mesa/main/dd.h
View File

@@ -752,7 +752,6 @@ struct dd_function_table {
* \name Vertex Array objects * \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 *); void (*BindArrayObject)(struct gl_context *ctx, struct gl_vertex_array_object *);
/*@}*/ /*@}*/

3
src/mesa/state_tracker/st_cb_bufferobjects.c
View File

@@ -527,7 +527,4 @@ st_init_bufferobject_functions(struct dd_function_table *functions)
functions->UnmapBuffer = st_bufferobj_unmap; functions->UnmapBuffer = st_bufferobj_unmap;
functions->CopyBufferSubData = st_copy_buffer_subdata; functions->CopyBufferSubData = st_copy_buffer_subdata;
functions->ClearBufferSubData = st_clear_buffer_subdata; functions->ClearBufferSubData = st_clear_buffer_subdata;
/* For GL_APPLE_vertex_array_object */
functions->DeleteArrayObject = _mesa_delete_vao;
} }