Mesa (master): gallium/dri: remove unneeded HAVE_SHARED_GLAPI guard

Emil Velikov evelikov at kemper.freedesktop.org
Thu May 4 17:23:12 UTC 2017


Module: Mesa
Branch: master
Commit: 4ea5f4b74c05d99e9c771b585ba531ed99a84bc5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4ea5f4b74c05d99e9c771b585ba531ed99a84bc5

Author: Emil Velikov <emil.velikov at collabora.com>
Date:   Thu Apr 13 16:12:02 2017 +0100

gallium/dri: remove unneeded HAVE_SHARED_GLAPI guard

Always true, since the dri modules required shared glapi.

With earlier commit (da410e6afad "configure: explicitly require shared
glapi for enable-dri") we even made that explicit during the configure
stage.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>

---

 src/gallium/targets/dri/Makefile.am | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/gallium/targets/dri/Makefile.am b/src/gallium/targets/dri/Makefile.am
index 8363406c58..e61df81228 100644
--- a/src/gallium/targets/dri/Makefile.am
+++ b/src/gallium/targets/dri/Makefile.am
@@ -1,9 +1,5 @@
 include $(top_srcdir)/src/gallium/Automake.inc
 
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
 AM_CFLAGS = \
 	-I$(top_srcdir)/src/mapi \
 	-I$(top_srcdir)/src/mesa \
@@ -55,7 +51,7 @@ gallium_dri_la_LIBADD = \
 	$(top_builddir)/src/gallium/drivers/noop/libnoop.la \
 	$(top_builddir)/src/gallium/drivers/rbug/librbug.la \
 	$(top_builddir)/src/gallium/drivers/trace/libtrace.la \
-	$(SHARED_GLAPI_LIB) \
+	$(top_builddir)/src/mapi/shared-glapi/libglapi.la \
 	$(SELINUX_LIBS) \
 	$(EXPAT_LIBS) \
 	$(LIBDRM_LIBS) \




More information about the mesa-commit mailing list