Mesa (master): mesa/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: 3186d33ae975c967ad7ec31cc763e9c47d5c4e22
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3186d33ae975c967ad7ec31cc763e9c47d5c4e22

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

mesa/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/mesa/drivers/dri/Makefile.am | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/mesa/drivers/dri/Makefile.am b/src/mesa/drivers/dri/Makefile.am
index fb0fc3258b..381c6a20b7 100644
--- a/src/mesa/drivers/dri/Makefile.am
+++ b/src/mesa/drivers/dri/Makefile.am
@@ -6,10 +6,6 @@ MEGADRIVERS_DEPS =
 
 SUBDIRS+=common
 
-if HAVE_SHARED_GLAPI
-SHARED_GLAPI_LIB = $(top_builddir)/src/mapi/shared-glapi/libglapi.la
-endif
-
 if HAVE_I915_DRI
 SUBDIRS += i915
 MEGADRIVERS_DEPS += i915/libi915_dri.la
@@ -70,7 +66,7 @@ mesa_dri_drivers_la_LIBADD = \
         common/libmegadriver_stub.la \
         common/libdricommon.la \
         common/libxmlconfig.la \
-        $(SHARED_GLAPI_LIB) \
+        $(top_builddir)/src/mapi/shared-glapi/libglapi.la \
         $(MEGADRIVERS_DEPS) \
         $(DRI_LIB_DEPS) \
         $()




More information about the mesa-commit mailing list