[Mesa-dev] [PATCH 02/45] mesa: remove FEATURE_texgen define.
Oliver McFadden
oliver.mcfadden at linux.intel.com
Tue Sep 11 02:56:15 PDT 2012
Signed-off-by: Oliver McFadden <oliver.mcfadden at linux.intel.com>
---
src/mesa/main/mfeatures.h | 1 -
src/mesa/main/texgen.c | 6 ------
src/mesa/main/texgen.h | 22 ----------------------
3 files changed, 0 insertions(+), 29 deletions(-)
diff --git a/src/mesa/main/mfeatures.h b/src/mesa/main/mfeatures.h
index 3761f0b..2597583 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 3788669..0b0f673 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 1d13422..35a7995 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 */
--
1.7.8.6
More information about the mesa-dev
mailing list