mesa: Remove some remaining FEATURE_* detritus.

Reviewed-by: Matt Turner <mattst88@gmail.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/Android.libmesa_dricore.mk b/src/mesa/Android.libmesa_dricore.mk
index 00c06943c0ba2b73a9f8922a9bc2ed9e3fdcd9f3..3679b50baabc52ef1a5048be8bcaccdecd23c551 100644 (file)
--- a/src/mesa/Android.libmesa_dricore.mk
+++ b/src/mesa/Android.libmesa_dricore.mk
@@ -49,9 +49,6 @@ ifeq ($(TARGET_ARCH),x86)
 endif # x86
 endif # MESA_ENABLE_ASM
 
-LOCAL_CFLAGS := \
-   $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
-
 LOCAL_C_INCLUDES := \
        $(call intermediates-dir-for STATIC_LIBRARIES,libmesa_program,,) \
        $(MESA_TOP)/src/mapi \

diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index 88629531a9d628b127122a4fd226f138d69d1585..9adf0b38620fbebd94479592ab261f0e0889f212 100644 (file)
--- a/src/mesa/drivers/dri/Android.mk
+++ b/src/mesa/drivers/dri/Android.mk
@@ -32,9 +32,6 @@ MESA_DRI_MODULE_PATH := $(TARGET_OUT_SHARED_LIBRARIES)/dri
 MESA_DRI_MODULE_UNSTRIPPED_PATH := $(TARGET_OUT_SHARED_LIBRARIES_UNSTRIPPED)/dri
 
 MESA_DRI_CFLAGS := \
-       -DFEATURE_GL=1 \
-       -DFEATURE_ES1=1 \
-       -DFEATURE_ES2=1 \
        -DHAVE_ANDROID_PLATFORM
 
 MESA_DRI_C_INCLUDES := \

diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index f66967d751f17fb575c1ac69b630ac03c646b2e7..46dd4c2775628e91e20d5d9afef583f260d49559 100644 (file)
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -35,16 +35,6 @@ AM_CFLAGS = \
        $(VISIBILITY_CFLAGS) \
        $(INTEL_CFLAGS)
 
-if HAVE_OPENGL_ES1
-AM_CFLAGS += \
-       -DFEATURE_ES1=1
-endif
-
-if HAVE_OPENGL_ES2
-AM_CFLAGS += \
-       -DFEATURE_ES2=1
-endif
-
 dridir = $(DRI_DRIVER_INSTALL_DIR)
 
 if HAVE_I915_DRI

diff --git a/src/mesa/drivers/dri/i915/intel_screen.c b/src/mesa/drivers/dri/i915/intel_screen.c
index 5a4734ffa473c5e724e75daa1e2b46ff3db0fab0..e3e6ac28bef74e021b884cc5994ea042af4f9cb5 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_screen.c
+++ b/src/mesa/drivers/dri/i915/intel_screen.c
@@ -1089,14 +1089,6 @@ set_max_gl_versions(struct intel_screen *screen)
       screen->max_gl_compat_version = MAX2(screen->max_gl_compat_version,
                                            gl_version_override);
    }
-
-#ifndef FEATURE_ES1
-   screen->max_gl_es1_version = 0;
-#endif
-
-#ifndef FEATURE_ES2
-   screen->max_gl_es2_version = 0;
-#endif
 }
 
 /**

diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 541e0d6e0678e9fc641ae79c9f87f54f85cf7cc4..eb437d316458cb121677ad1fddde5fdc8bc1188d 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -38,16 +38,6 @@ AM_CFLAGS = \
        $(VISIBILITY_CFLAGS) \
        $(INTEL_CFLAGS)
 
-if HAVE_OPENGL_ES1
-AM_CFLAGS += \
-       -DFEATURE_ES1=1
-endif
-
-if HAVE_OPENGL_ES2
-AM_CFLAGS += \
-       -DFEATURE_ES2=1
-endif
-
 AM_CXXFLAGS = $(AM_CFLAGS)
 
 dridir = $(DRI_DRIVER_INSTALL_DIR)

diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index eb6515e763d2a6a7318fc5ff5c530a1d5bb11ed5..de80a00ebb35cc054195c744e9b1b1158430c972 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -1250,14 +1250,6 @@ set_max_gl_versions(struct intel_screen *screen)
       screen->max_gl_compat_version = MAX2(screen->max_gl_compat_version,
                                            gl_version_override);
    }
-
-#ifndef FEATURE_ES1
-   screen->max_gl_es1_version = 0;
-#endif
-
-#ifndef FEATURE_ES2
-   screen->max_gl_es2_version = 0;
-#endif
 }
 
 /**

diff --git a/src/mesa/main/core.h b/src/mesa/main/core.h
index 0ba0db8a38cb3edf86771d12a8454d65929068e5..73ed01c259b4700335a69ff84a55508d169258cf 100644 (file)
--- a/src/mesa/main/core.h
+++ b/src/mesa/main/core.h
@@ -31,8 +31,7 @@
  * The public header of core mesa.
  *
  * This file is the (only) public header of core mesa.  It is supposed to be
- * used by GLX, WGL, and GLSL.  It is important that headers directly or
- * indirectly included here do not perform feature tests (#if FEATURE_xxx).
+ * used by GLX, WGL, and GLSL.
  */
 
 

diff --git a/src/mesa/program/Android.mk b/src/mesa/program/Android.mk
index 3f974ea27290be9e4b0bd5350b89567c81c6af4b..29a1b6a6373189746c6e6a4c36370ae728098967 100644 (file)
--- a/src/mesa/program/Android.mk
+++ b/src/mesa/program/Android.mk
@@ -71,9 +71,6 @@ $(intermediates)/program/program_parse.tab.h: $(intermediates)/program/program_p
 $(intermediates)/program/lex.yy.c: $(LOCAL_PATH)/program_lexer.l
        $(local-l-to-c)
 
-LOCAL_CFLAGS := \
-       $(patsubst %,-DFEATURE_%=1,$(MESA_ENABLED_APIS))
-
 LOCAL_C_INCLUDES := \
        $(intermediates) \
        $(MESA_TOP)/src/mapi \