diff options
author | Brian Paul <brianp@vmware.com> | 2009-06-26 17:49:14 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-06-26 17:49:14 -0600 |
commit | f57280cc7360d0eee40df6d34befbfad2288d297 (patch) | |
tree | ad561c76156356cfc377e57f0689348296828754 /src/mesa/main/shared.c | |
parent | a18e209edb5348eb167e9d7184597031bbbbe622 (diff) | |
parent | b2a1ca4fcf1cd16f85404fc582cec14e28b79e07 (diff) |
Merge branch 'arb_vertex_array_object'
Diffstat (limited to 'src/mesa/main/shared.c')
-rw-r--r-- | src/mesa/main/shared.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index 104f18f545..ad6e6ce7cd 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 */ @@ -207,18 +205,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 |