KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: remove FEATURE_beginend define. 

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Oliver McFadden 2012-09-11 09:06:56 +03:00
parent 985b0cb22f
commit 004f032baf
10 changed files with 1 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -86,9 +86,6 @@
#define ATTRIBI_4UI(index,x,y,z,w) CALL_VertexAttribI4uiEXT(GET_DISPATCH(), (index,x,y,z,w))
#if FEATURE_beginend
static void GLAPIENTRY
loopback_Color3b_f( GLbyte red, GLbyte green, GLbyte blue )
{
@ -1720,6 +1717,3 @@ _mesa_loopback_init_api_table( struct _glapi_table *dest )
SET_VertexAttribI4ubvEXT(dest, loopback_VertexAttribI4ubv);
SET_VertexAttribI4usvEXT(dest, loopback_VertexAttribI4usv);
}
#endif /* FEATURE_beginend */

11
src/mesa/main/api_loopback.h
View File

@ -32,17 +32,6 @@
struct _glapi_table;
#if FEATURE_beginend
extern void _mesa_loopback_init_api_table( struct _glapi_table *dest );
#else /* FEATURE_beginend */
static inline void
_mesa_loopback_init_api_table( struct _glapi_table *dest )
{
}
#endif /* FEATURE_beginend */
#endif /* API_LOOPBACK_H */

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

@ -84,11 +84,9 @@
#define FEATURE_remap_table 0
#endif
/* this disables vtxfmt, api_loopback, and api_noop completely */
#define FEATURE_beginend FEATURE_GL
#define FEATURE_colortable FEATURE_GL
#define FEATURE_convolve FEATURE_GL
#define FEATURE_dlist (FEATURE_GL && FEATURE_beginend)
#define FEATURE_dlist FEATURE_GL
#define FEATURE_draw_read_buffer FEATURE_GL
#define FEATURE_drawpix FEATURE_GL
#define FEATURE_evaluators FEATURE_GL

5
src/mesa/main/vtxfmt.c
View File

@ -38,8 +38,6 @@
#include "main/dispatch.h"
#if FEATURE_beginend
/**
* Use the per-vertex functions found in <vfmt> to initialize the given
* API dispatch table.
@ -235,6 +233,3 @@ _mesa_install_save_vtxfmt(struct gl_context *ctx, const GLvertexformat *vfmt)
if (_mesa_is_desktop_gl(ctx))
install_vtxfmt( ctx, ctx->Save, vfmt );
}
#endif /* FEATURE_beginend */

16
src/mesa/main/vtxfmt.h
View File

@ -37,23 +37,7 @@
#include "mfeatures.h"
#include "mtypes.h"
#if FEATURE_beginend
extern void _mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
extern void _mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt );
#else /* FEATURE_beginend */
static inline void
_mesa_install_exec_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
{
}
static inline void
_mesa_install_save_vtxfmt( struct gl_context *ctx, const GLvertexformat *vfmt )
{
}
#endif /* FEATURE_beginend */
#endif /* _VTXFMT_H_ */

15
src/mesa/vbo/vbo_exec.h
View File

@ -160,24 +160,9 @@ void vbo_exec_vtx_init( struct vbo_exec_context *exec );
void vbo_exec_vtx_destroy( struct vbo_exec_context *exec );
#if FEATURE_beginend
void vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap );
void vbo_exec_vtx_map( struct vbo_exec_context *exec );
#else /* FEATURE_beginend */
static inline void
vbo_exec_vtx_flush( struct vbo_exec_context *exec, GLboolean unmap )
{
}
static inline void
vbo_exec_vtx_map( struct vbo_exec_context *exec )
{
}
#endif /* FEATURE_beginend */
void vbo_exec_vtx_wrap( struct vbo_exec_context *exec );

71
src/mesa/vbo/vbo_exec_api.c
View File

@ -550,9 +550,6 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap)
}
#if FEATURE_beginend
#if FEATURE_evaluators
static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u )
@ -1048,74 +1045,6 @@ static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
}
#else /* FEATURE_beginend */
static void vbo_exec_vtxfmt_init( struct vbo_exec_context *exec )
{
/* silence warnings */
(void) vbo_Color3f;
(void) vbo_Color3fv;
(void) vbo_Color4f;
(void) vbo_Color4fv;
(void) vbo_FogCoordfEXT;
(void) vbo_FogCoordfvEXT;
(void) vbo_MultiTexCoord1f;
(void) vbo_MultiTexCoord1fv;
(void) vbo_MultiTexCoord2f;
(void) vbo_MultiTexCoord2fv;
(void) vbo_MultiTexCoord3f;
(void) vbo_MultiTexCoord3fv;
(void) vbo_MultiTexCoord4f;
(void) vbo_MultiTexCoord4fv;
(void) vbo_Normal3f;
(void) vbo_Normal3fv;
(void) vbo_SecondaryColor3fEXT;
(void) vbo_SecondaryColor3fvEXT;
(void) vbo_TexCoord1f;
(void) vbo_TexCoord1fv;
(void) vbo_TexCoord2f;
(void) vbo_TexCoord2fv;
(void) vbo_TexCoord3f;
(void) vbo_TexCoord3fv;
(void) vbo_TexCoord4f;
(void) vbo_TexCoord4fv;
(void) vbo_Vertex2f;
(void) vbo_Vertex2fv;
(void) vbo_Vertex3f;
(void) vbo_Vertex3fv;
(void) vbo_Vertex4f;
(void) vbo_Vertex4fv;
(void) vbo_VertexAttrib1fARB;
(void) vbo_VertexAttrib1fvARB;
(void) vbo_VertexAttrib2fARB;
(void) vbo_VertexAttrib2fvARB;
(void) vbo_VertexAttrib3fARB;
(void) vbo_VertexAttrib3fvARB;
(void) vbo_VertexAttrib4fARB;
(void) vbo_VertexAttrib4fvARB;
(void) vbo_VertexAttrib1fNV;
(void) vbo_VertexAttrib1fvNV;
(void) vbo_VertexAttrib2fNV;
(void) vbo_VertexAttrib2fvNV;
(void) vbo_VertexAttrib3fNV;
(void) vbo_VertexAttrib3fvNV;
(void) vbo_VertexAttrib4fNV;
(void) vbo_VertexAttrib4fvNV;
(void) vbo_Materialfv;
(void) vbo_EdgeFlag;
(void) vbo_Indexf;
(void) vbo_Indexfv;
}
#endif /* FEATURE_beginend */
/**
* Tell the VBO module to use a real OpenGL vertex buffer object to
* store accumulated immediate-mode vertex data.

6
src/mesa/vbo/vbo_exec_draw.c
View File

@ -38,9 +38,6 @@
#include "vbo_noop.h"
#if FEATURE_beginend
static void
vbo_exec_debug_verts( struct vbo_exec_context *exec )
{
@ -441,6 +438,3 @@ vbo_exec_vtx_flush(struct vbo_exec_context *exec, GLboolean keepUnmapped)
exec->vtx.prim_count = 0;
exec->vtx.vert_count = 0;
}
#endif /* FEATURE_beginend */

6
src/mesa/vbo/vbo_noop.c
View File

@ -37,9 +37,6 @@
#include "main/mfeatures.h"
#include "vbo/vbo_noop.h"
#if FEATURE_beginend
static void GLAPIENTRY
_mesa_noop_EdgeFlag(GLboolean b)
{
@ -514,6 +511,3 @@ _mesa_using_noop_vtxfmt(const struct _glapi_table *dispatch)
{
return GET_Begin((struct _glapi_table *) dispatch) == _mesa_noop_Begin;
}
#endif /* FEATURE_beginend */

11
src/mesa/vbo/vbo_noop.h
View File

@ -30,22 +30,11 @@
#include "main/mtypes.h"
#if FEATURE_beginend
extern void
_mesa_noop_vtxfmt_init(GLvertexformat *vfmt);
extern GLboolean
_mesa_using_noop_vtxfmt(const struct _glapi_table *dispatch);
#else
static inline void
_mesa_noop_vtxfmt_init(GLvertexformat *vfmt)
{
}
#endif /* FEATURE_beginend */
#endif /* _API_NOOP_H */