From 12cf98f5fc5eaa4743134387ce3f8e584aa20bc4 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Fri, 19 Jun 2009 17:58:47 -0600 Subject: mesa: move vertex array objects from shared state to per-context The ARB version requires VAOs to be per-context while the Apple extension was ambiguous. --- src/mesa/main/shared.c | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src/mesa/main/shared.c') diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index 104f18f545a..ad6e6ce7cd3 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -100,8 +100,6 @@ _mesa_alloc_shared_state(GLcontext *ctx) shared->NullBufferObj = ctx->Driver.NewBufferObject(ctx, 0, 0); shared->NullBufferObj->RefCount = 1000 * 1000 * 1000; - shared->ArrayObjects = _mesa_NewHashTable(); - /* Create default texture objects */ for (i = 0; i < NUM_TEXTURE_TARGETS; i++) { /* NOTE: the order of these enums matches the TEXTURE_x_INDEX values */ @@ -206,18 +204,6 @@ delete_bufferobj_cb(GLuint id, void *data, void *userData) } -/** - * Callback for deleting an array object. Called by _mesa_HashDeleteAll(). - */ -static void -delete_arrayobj_cb(GLuint id, void *data, void *userData) -{ - struct gl_array_object *arrayObj = (struct gl_array_object *) data; - GLcontext *ctx = (GLcontext *) userData; - _mesa_delete_array_object(ctx, arrayObj); -} - - /** * Callback for freeing shader program data. Call it before delete_shader_cb * to avoid memory access error. @@ -320,9 +306,6 @@ _mesa_free_shared_state(GLcontext *ctx, struct gl_shared_state *shared) _mesa_HashDeleteAll(shared->Programs, delete_program_cb, ctx); _mesa_DeleteHashTable(shared->Programs); - _mesa_HashDeleteAll(shared->ArrayObjects, delete_arrayobj_cb, ctx); - _mesa_DeleteHashTable(shared->ArrayObjects); - #if FEATURE_ARB_vertex_program _mesa_reference_vertprog(ctx, &shared->DefaultVertexProgram, NULL); #endif -- cgit v1.2.3