From: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Fri, 19 Apr 2013 18:41:08 +0000 (+0200)
Subject: intel: use automake conditionals for defining FEATURE_{ES1,ES2}
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b8f55c4da11f892bcbc878fc92c7119aaabf674;p=mesa.git

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 72e0659530a..95017191949 100644
--- 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 77670efdee8..32b041a8caa 100644
--- 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)