From eeed210c7d407d9132f10007f797bc3b44ada553 Mon Sep 17 00:00:00 2001 From: Oliver McFadden Date: Tue, 11 Sep 2012 08:59:27 +0300 Subject: [PATCH] mesa: remove FEATURE_texgen define. Signed-off-by: Oliver McFadden Reviewed-by: Brian Paul --- src/mesa/main/mfeatures.h | 1 - src/mesa/main/texgen.c | 6 ------ src/mesa/main/texgen.h | 22 ---------------------- 3 files changed, 29 deletions(-) diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h index 3761f0b67ba..2597583ec63 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_texgen 1 #define FEATURE_userclip 1 #define FEATURE_accum FEATURE_GL diff --git a/src/mesa/main/texgen.c b/src/mesa/main/texgen.c index 3788669d4ea..0b0f673356a 100644 --- a/src/mesa/main/texgen.c +++ b/src/mesa/main/texgen.c @@ -41,9 +41,6 @@ #include "main/dispatch.h" -#if FEATURE_texgen - - /** * Return texgen state for given coordinate */ @@ -441,6 +438,3 @@ _mesa_init_texgen_dispatch(struct _glapi_table *disp) SET_TexGeni(disp, _mesa_TexGeni); SET_TexGeniv(disp, _mesa_TexGeniv); } - - -#endif /* FEATURE_texgen */ diff --git a/src/mesa/main/texgen.h b/src/mesa/main/texgen.h index 1d13422b2db..35a799587d5 100644 --- a/src/mesa/main/texgen.h +++ b/src/mesa/main/texgen.h @@ -34,8 +34,6 @@ struct _glapi_table; -#if FEATURE_texgen - extern void GLAPIENTRY _mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ); @@ -65,24 +63,4 @@ extern void GLAPIENTRY _es_TexGenfv(GLenum coord, GLenum pname, const GLfloat *params); -#else /* FEATURE_texgen */ - -static void -_mesa_TexGenfv( GLenum coord, GLenum pname, const GLfloat *params ) -{ -} - -static void inline -_mesa_TexGeni( GLenum coord, GLenum pname, GLint param ) -{ -} - -static inline void -_mesa_init_texgen_dispatch(struct _glapi_table *disp) -{ -} - -#endif /* FEATURE_texgen */ - - #endif /* TEXGEN_H */ -- 2.30.2