On 09/25/2013 04:28 PM, Eric Anholt wrote: > --- > src/mesa/Android.libmesa_dricore.mk | 3 --- > src/mesa/drivers/dri/Android.mk | 3 --- > src/mesa/drivers/dri/i915/Makefile.am | 10 ---------- > src/mesa/drivers/dri/i915/intel_screen.c | 8 -------- > src/mesa/drivers/dri/i965/Makefile.am | 10 ---------- > src/mesa/drivers/dri/i965/intel_screen.c | 8 -------- > src/mesa/main/core.h | 3 +-- > src/mesa/program/Android.mk | 3 --- > 8 files changed, 1 insertion(+), 47 deletions(-) > > diff --git a/src/mesa/Android.libmesa_dricore.mk > b/src/mesa/Android.libmesa_dricore.mk > index 00c0694..3679b50 100644 > --- 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 8862953..9adf0b3 100644 > --- 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 f66967d..46dd4c2 100644 > --- 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 5a4734f..e3e6ac2 100644 > --- 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 541e0d6..eb437d3 100644 > --- 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 eb6515e..de80a00 100644 > --- 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 0ba0db8..73ed01c 100644 > --- 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 3f974ea..29a1b6a 100644 > --- 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 \ >
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev