diff options
Diffstat (limited to 'src/mesa')
-rw-r--r-- | src/mesa/main/eval.c | 6 | ||||
-rw-r--r-- | src/mesa/main/eval.h | 19 | ||||
-rw-r--r-- | src/mesa/main/mfeatures.h | 1 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_exec_api.c | 4 | ||||
-rw-r--r-- | src/mesa/vbo/vbo_noop.c | 4 |
5 files changed, 0 insertions, 34 deletions
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index ca1b33bd2ed..b0458a1e822 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -48,9 +48,6 @@ #include "main/dispatch.h" -#if FEATURE_evaluators - - /* * Return the number of components per control point for any type of * evaluator. Return 0 if bad target. @@ -924,9 +921,6 @@ _mesa_init_eval_dispatch(struct _glapi_table *disp) } -#endif /* FEATURE_evaluators */ - - /**********************************************************************/ /***** Initialization *****/ /**********************************************************************/ diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h index c07d4d53298..0649de052d4 100644 --- a/src/mesa/main/eval.h +++ b/src/mesa/main/eval.h @@ -41,8 +41,6 @@ #include "main/mtypes.h" -#if FEATURE_evaluators - #define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) \ do { \ (vfmt)->EvalCoord1f = impl ## EvalCoord1f; \ @@ -83,23 +81,6 @@ _mesa_install_eval_vtxfmt(struct _glapi_table *disp, extern void _mesa_init_eval_dispatch(struct _glapi_table *disp); -#else /* FEATURE_evaluators */ - -#define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0) - -static inline void -_mesa_install_eval_vtxfmt(struct _glapi_table *disp, - const GLvertexformat *vfmt) -{ -} - -static inline void -_mesa_init_eval_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_evaluators */ - extern void _mesa_init_eval( struct gl_context *ctx ); extern void _mesa_free_eval_data( struct gl_context *ctx ); diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 9695e38e8da..c1abe8110a7 100644 --- a/src/mesa/main/mfeatures.h +++ b/src/mesa/main/mfeatures.h @@ -84,7 +84,6 @@ #define FEATURE_remap_table 0 #endif -#define FEATURE_evaluators FEATURE_GL #define FEATURE_feedback FEATURE_GL #define FEATURE_pixel_transfer FEATURE_GL #define FEATURE_queryobj FEATURE_GL diff --git a/src/mesa/vbo/vbo_exec_api.c b/src/mesa/vbo/vbo_exec_api.c index ccd5dfb26ae..6bcb61cc83d 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -550,8 +550,6 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) } -#if FEATURE_evaluators - static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u ) { GET_CURRENT_CONTEXT( ctx ); @@ -754,8 +752,6 @@ vbo_exec_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) } } -#endif /* FEATURE_evaluators */ - /** * Execute a glRectf() function. This is not suitable for GL_COMPILE diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c index 86bdbb04edb..2f220021926 100644 --- a/src/mesa/vbo/vbo_noop.c +++ b/src/mesa/vbo/vbo_noop.c @@ -301,8 +301,6 @@ _mesa_noop_Vertex4f(GLfloat a, GLfloat b, GLfloat c, GLfloat d) { } - -#if FEATURE_evaluators static void GLAPIENTRY _mesa_noop_EvalCoord1f(GLfloat a) { @@ -332,8 +330,6 @@ static void GLAPIENTRY _mesa_noop_EvalPoint2(GLint a, GLint b) { } -#endif /* FEATURE_evaluators */ - static void GLAPIENTRY _mesa_noop_Begin(GLenum mode) |