From: Mathias Fröhlich <Mathias.Froehlich@web.de>
Date: Tue, 27 Dec 2011 09:45:46 +0000 (+0100)
Subject: mesa: Remove remaining FEATURE_ARB_vertex_buffer_object guards.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1ef3a94536ab4d70f08e5e19d7ebae0bca126e61;p=mesa.git

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 <Mathias.Froehlich@web.de>
---

diff --git a/src/mesa/main/api_exec.c b/src/mesa/main/api_exec.c
index 26fd37e6377..605af381d7a 100644
--- a/src/mesa/main/api_exec.c
+++ b/src/mesa/main/api_exec.c
@@ -39,9 +39,7 @@
 #include "atifragshader.h"
 #include "attrib.h"
 #include "blend.h"
-#if FEATURE_ARB_vertex_buffer_object
 #include "bufferobj.h"
-#endif
 #include "arrayobj.h"
 #if FEATURE_draw_read_buffer
 #include "buffers.h"
@@ -580,7 +578,6 @@ _mesa_create_exec_table(void)
 #endif
 
    /* ARB 28. GL_ARB_vertex_buffer_object */
-#if FEATURE_ARB_vertex_buffer_object
    SET_BindBufferARB(exec, _mesa_BindBufferARB);
    SET_BufferDataARB(exec, _mesa_BufferDataARB);
    SET_BufferSubDataARB(exec, _mesa_BufferSubDataARB);
@@ -592,7 +589,6 @@ _mesa_create_exec_table(void)
    SET_IsBufferARB(exec, _mesa_IsBufferARB);
    SET_MapBufferARB(exec, _mesa_MapBufferARB);
    SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB);
-#endif
 
    /* ARB 29. GL_ARB_occlusion_query */
    _mesa_init_queryobj_dispatch(exec);
diff --git a/src/mesa/main/arrayobj.c b/src/mesa/main/arrayobj.c
index 0439063b1e2..4b3e07b8517 100644
--- a/src/mesa/main/arrayobj.c
+++ b/src/mesa/main/arrayobj.c
@@ -45,9 +45,7 @@
 #include "imports.h"
 #include "context.h"
 #include "mfeatures.h"
-#if FEATURE_ARB_vertex_buffer_object
 #include "bufferobj.h"
-#endif
 #include "arrayobj.h"
 #include "macros.h"
 #include "mtypes.h"
@@ -195,11 +193,9 @@ init_array(struct gl_context *ctx,
    array->Normalized = GL_FALSE;
    array->Integer = GL_FALSE;
    array->_ElementSize = size * _mesa_sizeof_type(type);
-#if FEATURE_ARB_vertex_buffer_object
    /* Vertex array buffers */
    _mesa_reference_buffer_object(ctx, &array->BufferObj,
                                  ctx->Shared->NullBufferObj);
-#endif
 }
 
 
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 0090481701a..f39cab5e4b6 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1133,9 +1133,7 @@ _mesa_free_context_data( struct gl_context *ctx )
    _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, NULL);
 #endif
 
-#if FEATURE_ARB_vertex_buffer_object
    _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
-#endif
 
    /* free dispatch tables */
    free(ctx->Exec);
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c
index b3edae0e6d9..95b8211b23c 100644
--- a/src/mesa/main/dlist.c
+++ b/src/mesa/main/dlist.c
@@ -40,9 +40,7 @@
 #endif
 #include "config.h"
 #include "mfeatures.h"
-#if FEATURE_ARB_vertex_buffer_object
 #include "bufferobj.h"
-#endif
 #include "arrayobj.h"
 #include "context.h"
 #include "dlist.h"
@@ -10184,7 +10182,6 @@ _mesa_create_save_table(void)
 #endif
 
    /* ARB 28. GL_ARB_vertex_buffer_object */
-#if FEATURE_ARB_vertex_buffer_object
    /* None of the extension's functions get compiled */
    SET_BindBufferARB(table, _mesa_BindBufferARB);
    SET_BufferDataARB(table, _mesa_BufferDataARB);
@@ -10197,7 +10194,6 @@ _mesa_create_save_table(void)
    SET_IsBufferARB(table, _mesa_IsBufferARB);
    SET_MapBufferARB(table, _mesa_MapBufferARB);
    SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
-#endif
 
 #if FEATURE_queryobj
    _mesa_init_queryobj_dispatch(table); /* glGetQuery, etc */
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 33db5081419..b67f046ca6c 100644
--- a/src/mesa/main/mfeatures.h
+++ b/src/mesa/main/mfeatures.h
@@ -124,7 +124,6 @@
 #define FEATURE_ARB_pixel_buffer_object   (FEATURE_GL && FEATURE_EXT_pixel_buffer_object)
 #define FEATURE_ARB_sampler_objects       FEATURE_GL
 #define FEATURE_ARB_sync                  FEATURE_GL
-#define FEATURE_ARB_vertex_buffer_object  1
 
 #define FEATURE_EXT_framebuffer_blit      FEATURE_GL
 #define FEATURE_EXT_framebuffer_object    1
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;