mesa: remove FEATURE_texgen define.

Signed-off-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 3761f0b67ba43583c0e2a736e8b1cb24a378ded8..2597583ec63142a5e789e4f91c0f692dbda9524c 100644 (file)
--- 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 3788669d4ea86e97fe02ee230150d3a62e02821c..0b0f673356abb2368856c61c9736549f9f4c9071 100644 (file)
--- 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 1d13422b2db979d412d305e1d842f12488548ce8..35a799587d5c5957844f166c5d84f60ff2eaec29 100644 (file)
--- 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 */