summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-09-25 15:41:46 -0700
committerEric Anholt <eric@anholt.net>2013-09-26 16:29:39 -0700
commit1c904466aa3a1914b42bc6d7fed6f458dba985c0 (patch)
tree0ea29918adbf6e1f611c9971db16d374492b1584 /src/mesa/drivers/dri
parentfe2528c0b69d5719b15d926ada9424cac7569b9c (diff)
mesa: Remove some remaining FEATURE_* detritus.
Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/Android.mk3
-rw-r--r--src/mesa/drivers/dri/i915/Makefile.am10
-rw-r--r--src/mesa/drivers/dri/i915/intel_screen.c8
-rw-r--r--src/mesa/drivers/dri/i965/Makefile.am10
-rw-r--r--src/mesa/drivers/dri/i965/intel_screen.c8
5 files changed, 0 insertions, 39 deletions
diff --git a/src/mesa/drivers/dri/Android.mk b/src/mesa/drivers/dri/Android.mk
index 88629531a9d..9adf0b38620 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 f66967d751f..46dd4c27756 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 5a4734ffa47..e3e6ac28bef 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 541e0d6e067..eb437d31645 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 eb6515e763d..de80a00ebb3 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
}
/**