intel: use automake conditionals for defining FEATURE_{ES1,ES2}

Removes the need of API_DEFINES.

Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mesa/drivers/dri/i915/Makefile.am b/src/mesa/drivers/dri/i915/Makefile.am
index 72e0659530ab44c665a3d499558773e9d6004324..950171919497032be55bafdc5d4ee65ec0965e92 100644 (file)
--- a/src/mesa/drivers/dri/i915/Makefile.am
+++ b/src/mesa/drivers/dri/i915/Makefile.am
@@ -34,10 +34,19 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/mesa/drivers/dri/intel/server \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(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/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
index 77670efdee843090463e8aeca574548c27be8703..32b041a8caa941cebf171526aaac2382958164ac 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.am
+++ b/src/mesa/drivers/dri/i965/Makefile.am
@@ -36,10 +36,19 @@ AM_CFLAGS = \
        -I$(top_srcdir)/src/gtest/include \
        -I$(top_builddir)/src/mesa/drivers/dri/common \
        $(DEFINES) \
-       $(API_DEFINES) \
        $(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)