diff options
| author | Mathias Fröhlich <[email protected]> | 2011-12-27 10:45:46 +0100 |
|---|---|---|
| committer | Mathias Fröhlich <[email protected]> | 2011-12-28 11:05:13 +0100 |
| commit | 1ef3a94536ab4d70f08e5e19d7ebae0bca126e61 (patch) | |
| tree | a53afb34704cde9baa61a1356c63af4068686339 /src/mesa/main/shared.c | |
| parent | ccbf192f597186f6a4a04ed14391dba82ffee18b (diff) | |
mesa: Remove remaining FEATURE_ARB_vertex_buffer_object guards.
Since commit 82b9661894315362f857192439bdcbc9db090387 and
34eae1c72a9b3a8eb0634cda52fca0208cd2f40d vbo support
is mandatory for all drivers. So, remove the remaining
FEATURE_ARB_vertex_buffer_object guards.
Signed-off-by: Mathias Froehlich <[email protected]>
Diffstat (limited to 'src/mesa/main/shared.c')
| -rw-r--r-- | src/mesa/main/shared.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/mesa/main/shared.c b/src/mesa/main/shared.c index caa6132d4ab..276fac149ed 100644 --- a/src/mesa/main/shared.c +++ b/src/mesa/main/shared.c @@ -89,9 +89,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx) shared->ShaderObjects = _mesa_NewHashTable(); #endif -#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object shared->BufferObjects = _mesa_NewHashTable(); -#endif #if FEATURE_ARB_sampler_objects /* GL_ARB_sampler_objects */ @@ -342,10 +340,8 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared) _mesa_delete_ati_fragment_shader(ctx, shared->DefaultFragmentShader); #endif -#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object _mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx); _mesa_DeleteHashTable(shared->BufferObjects); -#endif #if FEATURE_EXT_framebuffer_object _mesa_HashDeleteAll(shared->FrameBuffers, delete_framebuffer_cb, ctx); @@ -354,9 +350,7 @@ free_shared_state(struct gl_context *ctx, struct gl_shared_state *shared) _mesa_DeleteHashTable(shared->RenderBuffers); #endif -#if FEATURE_ARB_vertex_buffer_object _mesa_reference_buffer_object(ctx, &shared->NullBufferObj, NULL); -#endif { struct simple_node *node; |