Signed-off-by: Oliver McFadden <oliver.mcfad...@linux.intel.com> --- src/mesa/main/eval.c | 4 ++-- src/mesa/main/eval.h | 6 +++--- src/mesa/main/mfeatures.h | 1 - src/mesa/vbo/vbo_exec_api.c | 4 ++-- src/mesa/vbo/vbo_noop.c | 4 ++-- 5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/src/mesa/main/eval.c b/src/mesa/main/eval.c index ca1b33b..d603778 100644 --- a/src/mesa/main/eval.c +++ b/src/mesa/main/eval.c @@ -48,7 +48,7 @@ #include "main/dispatch.h" -#if FEATURE_evaluators +#if FEATURE_GL /* @@ -924,7 +924,7 @@ _mesa_init_eval_dispatch(struct _glapi_table *disp) } -#endif /* FEATURE_evaluators */ +#endif /* FEATURE_GL */ /**********************************************************************/ diff --git a/src/mesa/main/eval.h b/src/mesa/main/eval.h index c07d4d5..0e2df15 100644 --- a/src/mesa/main/eval.h +++ b/src/mesa/main/eval.h @@ -41,7 +41,7 @@ #include "main/mtypes.h" -#if FEATURE_evaluators +#if FEATURE_GL #define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) \ do { \ @@ -83,7 +83,7 @@ _mesa_install_eval_vtxfmt(struct _glapi_table *disp, extern void _mesa_init_eval_dispatch(struct _glapi_table *disp); -#else /* FEATURE_evaluators */ +#else /* FEATURE_GL */ #define _MESA_INIT_EVAL_VTXFMT(vfmt, impl) do { } while (0) @@ -98,7 +98,7 @@ _mesa_init_eval_dispatch(struct _glapi_table *disp) { } -#endif /* FEATURE_evaluators */ +#endif /* FEATURE_GL */ 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 9695e38..c1abe81 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 8248eae..272abed 100644 --- a/src/mesa/vbo/vbo_exec_api.c +++ b/src/mesa/vbo/vbo_exec_api.c @@ -553,7 +553,7 @@ vbo_exec_FlushVertices_internal(struct vbo_exec_context *exec, GLboolean unmap) #if FEATURE_GL -#if FEATURE_evaluators +#if FEATURE_GL static void GLAPIENTRY vbo_exec_EvalCoord1f( GLfloat u ) { @@ -757,7 +757,7 @@ vbo_exec_EvalMesh2(GLenum mode, GLint i1, GLint i2, GLint j1, GLint j2) } } -#endif /* FEATURE_evaluators */ +#endif /* FEATURE_GL */ /** diff --git a/src/mesa/vbo/vbo_noop.c b/src/mesa/vbo/vbo_noop.c index 9e01b04..7203240 100644 --- a/src/mesa/vbo/vbo_noop.c +++ b/src/mesa/vbo/vbo_noop.c @@ -305,7 +305,7 @@ _mesa_noop_Vertex4f(GLfloat a, GLfloat b, GLfloat c, GLfloat d) } -#if FEATURE_evaluators +#if FEATURE_GL static void GLAPIENTRY _mesa_noop_EvalCoord1f(GLfloat a) { @@ -335,7 +335,7 @@ static void GLAPIENTRY _mesa_noop_EvalPoint2(GLint a, GLint b) { } -#endif /* FEATURE_evaluators */ +#endif /* FEATURE_GL */ static void GLAPIENTRY -- 1.7.8.6 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev