summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-09-17 03:31:30 +0000
committerBrian Paul <[email protected]>2003-09-17 03:31:30 +0000
commit978646d86fd19c0f564b01a469ffe0432fc5ab98 (patch)
tree925edf833441d1fbad500a2aa6ce6ce025eb90b7
parent1d57658ee545f6ad01c378dea46058e5513f629c (diff)
fix up FEATURE_* defines
-rw-r--r--src/mesa/main/config.h35
1 files changed, 14 insertions, 21 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h
index d4c3cf5df87..3e1a23f2c55 100644
--- a/src/mesa/main/config.h
+++ b/src/mesa/main/config.h
@@ -242,34 +242,27 @@
#define BCOMP 2
#define ACOMP 3
-#ifndef _HAVE_FULL_GL
-#define _HAVE_FULL_GL 1
-#endif
/*
* Enable/disable features (blocks of code) by setting FEATURE_xyz to 0 or 1.
*/
-#if _HAVE_FULL_GL
-#define FEATURE_NV_vertex_program 1
-#define FEATURE_NV_fragment_program 1
-#define FEATURE_ARB_vertex_buffer_object 1
-#define FEATURE_ARB_vertex_program 1
-#define FEATURE_ARB_fragment_program 1
-#define FEATURE_ARB_occlusion_query 1
-#define FEATURE_ARB_vertex_buffer_object 1
-#define FEATURE_MESA_program_debug 1
-#define FEATURE_NV_fence 1
-#define FEATURE_userclip 1
-#define FEATURE_texgen 1
-#define FEATURE_windowpos 1
-#endif
-
-/*@}*/
-
-
#ifndef _HAVE_FULL_GL
#define _HAVE_FULL_GL 1
#endif
+#define FEATURE_ARB_vertex_buffer_object _HAVE_FULL_GL
+#define FEATURE_ARB_vertex_program _HAVE_FULL_GL
+#define FEATURE_ARB_fragment_program _HAVE_FULL_GL
+#define FEATURE_ARB_occlusion_query _HAVE_FULL_GL
+#define FEATURE_MESA_program_debug _HAVE_FULL_GL
+#define FEATURE_NV_fence _HAVE_FULL_GL
+#define FEATURE_NV_fragment_program _HAVE_FULL_GL
+#define FEATURE_NV_vertex_program _HAVE_FULL_GL
+#define FEATURE_userclip _HAVE_FULL_GL
+#define FEATURE_texgen _HAVE_FULL_GL
+#define FEATURE_windowpos _HAVE_FULL_GL
+
+/*@}*/
+
#endif /* CONFIG_H */