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

mesa: Remove remaining FEATURE_ARB_vertex_buffer_object guards.

Browse Source 
Since commit 82b9661894 and
34eae1c72a 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>
This commit is contained in:
Mathias Fröhlich
2011-12-27 10:45:46 +01:00
parent ccbf192f59
commit 1ef3a94536
6 changed files with 0 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/mesa/main/api_exec.c
View File

@@ -39,9 +39,7 @@
#include "atifragshader.h" #include "atifragshader.h"
#include "attrib.h" #include "attrib.h"
#include "blend.h" #include "blend.h"
#if FEATURE_ARB_vertex_buffer_object
#include "bufferobj.h" #include "bufferobj.h"
#endif
#include "arrayobj.h" #include "arrayobj.h"
#if FEATURE_draw_read_buffer #if FEATURE_draw_read_buffer
#include "buffers.h" #include "buffers.h"
@@ -580,7 +578,6 @@ _mesa_create_exec_table(void)
#endif #endif
/* ARB 28. GL_ARB_vertex_buffer_object */ /* ARB 28. GL_ARB_vertex_buffer_object */
#if FEATURE_ARB_vertex_buffer_object
SET_BindBufferARB(exec, _mesa_BindBufferARB); SET_BindBufferARB(exec, _mesa_BindBufferARB);
SET_BufferDataARB(exec, _mesa_BufferDataARB); SET_BufferDataARB(exec, _mesa_BufferDataARB);
SET_BufferSubDataARB(exec, _mesa_BufferSubDataARB); SET_BufferSubDataARB(exec, _mesa_BufferSubDataARB);
@@ -592,7 +589,6 @@ _mesa_create_exec_table(void)
SET_IsBufferARB(exec, _mesa_IsBufferARB); SET_IsBufferARB(exec, _mesa_IsBufferARB);
SET_MapBufferARB(exec, _mesa_MapBufferARB); SET_MapBufferARB(exec, _mesa_MapBufferARB);
SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB); SET_UnmapBufferARB(exec, _mesa_UnmapBufferARB);
#endif
/* ARB 29. GL_ARB_occlusion_query */ /* ARB 29. GL_ARB_occlusion_query */
_mesa_init_queryobj_dispatch(exec); _mesa_init_queryobj_dispatch(exec);

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

@@ -45,9 +45,7 @@
#include "imports.h" #include "imports.h"
#include "context.h" #include "context.h"
#include "mfeatures.h" #include "mfeatures.h"
#if FEATURE_ARB_vertex_buffer_object
#include "bufferobj.h" #include "bufferobj.h"
#endif
#include "arrayobj.h" #include "arrayobj.h"
#include "macros.h" #include "macros.h"
#include "mtypes.h" #include "mtypes.h"
@@ -195,11 +193,9 @@ init_array(struct gl_context *ctx,
array->Normalized = GL_FALSE; array->Normalized = GL_FALSE;
array->Integer = GL_FALSE; array->Integer = GL_FALSE;
array->_ElementSize = size * _mesa_sizeof_type(type); array->_ElementSize = size * _mesa_sizeof_type(type);
#if FEATURE_ARB_vertex_buffer_object
/* Vertex array buffers */ /* Vertex array buffers */
_mesa_reference_buffer_object(ctx, &array->BufferObj, _mesa_reference_buffer_object(ctx, &array->BufferObj,
ctx->Shared->NullBufferObj); ctx->Shared->NullBufferObj);
#endif
} }

2
src/mesa/main/context.c
View File

@@ -1133,9 +1133,7 @@ _mesa_free_context_data( struct gl_context *ctx )
_mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, NULL); _mesa_reference_buffer_object(ctx, &ctx->DefaultPacking.BufferObj, NULL);
#endif #endif
#if FEATURE_ARB_vertex_buffer_object
_mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL); _mesa_reference_buffer_object(ctx, &ctx->Array.ArrayBufferObj, NULL);
#endif
/* free dispatch tables */ /* free dispatch tables */
free(ctx->Exec); free(ctx->Exec);

4
src/mesa/main/dlist.c
View File

@@ -40,9 +40,7 @@
#endif #endif
#include "config.h" #include "config.h"
#include "mfeatures.h" #include "mfeatures.h"
#if FEATURE_ARB_vertex_buffer_object
#include "bufferobj.h" #include "bufferobj.h"
#endif
#include "arrayobj.h" #include "arrayobj.h"
#include "context.h" #include "context.h"
#include "dlist.h" #include "dlist.h"
@@ -10184,7 +10182,6 @@ _mesa_create_save_table(void)
#endif #endif
/* ARB 28. GL_ARB_vertex_buffer_object */ /* ARB 28. GL_ARB_vertex_buffer_object */
#if FEATURE_ARB_vertex_buffer_object
/* None of the extension's functions get compiled */ /* None of the extension's functions get compiled */
SET_BindBufferARB(table, _mesa_BindBufferARB); SET_BindBufferARB(table, _mesa_BindBufferARB);
SET_BufferDataARB(table, _mesa_BufferDataARB); SET_BufferDataARB(table, _mesa_BufferDataARB);
@@ -10197,7 +10194,6 @@ _mesa_create_save_table(void)
SET_IsBufferARB(table, _mesa_IsBufferARB); SET_IsBufferARB(table, _mesa_IsBufferARB);
SET_MapBufferARB(table, _mesa_MapBufferARB); SET_MapBufferARB(table, _mesa_MapBufferARB);
SET_UnmapBufferARB(table, _mesa_UnmapBufferARB); SET_UnmapBufferARB(table, _mesa_UnmapBufferARB);
#endif
#if FEATURE_queryobj #if FEATURE_queryobj
_mesa_init_queryobj_dispatch(table); /* glGetQuery, etc */ _mesa_init_queryobj_dispatch(table); /* glGetQuery, etc */

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

@@ -124,7 +124,6 @@
#define FEATURE_ARB_pixel_buffer_object (FEATURE_GL && FEATURE_EXT_pixel_buffer_object) #define FEATURE_ARB_pixel_buffer_object (FEATURE_GL && FEATURE_EXT_pixel_buffer_object)
#define FEATURE_ARB_sampler_objects FEATURE_GL #define FEATURE_ARB_sampler_objects FEATURE_GL
#define FEATURE_ARB_sync 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_blit FEATURE_GL
#define FEATURE_EXT_framebuffer_object 1 #define FEATURE_EXT_framebuffer_object 1

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

@@ -89,9 +89,7 @@ _mesa_alloc_shared_state(struct gl_context *ctx)
shared->ShaderObjects = _mesa_NewHashTable(); shared->ShaderObjects = _mesa_NewHashTable();
#endif #endif
#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
shared->BufferObjects = _mesa_NewHashTable(); shared->BufferObjects = _mesa_NewHashTable();
#endif
#if FEATURE_ARB_sampler_objects #if FEATURE_ARB_sampler_objects
/* GL_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); _mesa_delete_ati_fragment_shader(ctx, shared->DefaultFragmentShader);
#endif #endif
#if FEATURE_ARB_vertex_buffer_object || FEATURE_ARB_pixel_buffer_object
_mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx); _mesa_HashDeleteAll(shared->BufferObjects, delete_bufferobj_cb, ctx);
_mesa_DeleteHashTable(shared->BufferObjects); _mesa_DeleteHashTable(shared->BufferObjects);
#endif
#if FEATURE_EXT_framebuffer_object #if FEATURE_EXT_framebuffer_object
_mesa_HashDeleteAll(shared->FrameBuffers, delete_framebuffer_cb, ctx); _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); _mesa_DeleteHashTable(shared->RenderBuffers);
#endif #endif
#if FEATURE_ARB_vertex_buffer_object
_mesa_reference_buffer_object(ctx, &shared->NullBufferObj, NULL); _mesa_reference_buffer_object(ctx, &shared->NullBufferObj, NULL);
#endif
{ {
struct simple_node *node; struct simple_node *node;