diff options
| author | Emil Velikov <[email protected]> | 2015-07-13 22:20:38 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2015-07-22 16:35:26 +0100 |
| commit | dc1ece3748f3a97d685c9c72ad26684fd35f1944 (patch) | |
| tree | acaf73f41450c42aab788bbc9a601ea9893dc9b4 | |
| parent | 78674631a2d0ff1eb538470e2a1d516201361f03 (diff) | |
egl: remove flatten HAVE_SHARED_GLAPI
It is simply not possible to use the dri backend without shared glapi,
as the alternative provider (libGL) is not always present. We have fixed
the build for a while now, so we can rip this out.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Matt Turner <[email protected]>
| -rw-r--r-- | src/egl/drivers/dri2/Android.mk | 1 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/Makefile.am | 4 | ||||
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.c | 8 |
3 files changed, 0 insertions, 13 deletions
diff --git a/src/egl/drivers/dri2/Android.mk b/src/egl/drivers/dri2/Android.mk index 109e4d4a0d8..76be3b246ba 100644 --- a/src/egl/drivers/dri2/Android.mk +++ b/src/egl/drivers/dri2/Android.mk @@ -32,7 +32,6 @@ LOCAL_SRC_FILES := \ platform_android.c LOCAL_CFLAGS := \ - -DHAVE_SHARED_GLAPI \ -DHAVE_ANDROID_PLATFORM ifeq ($(MESA_LOLLIPOP_BUILD),true) diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am index f4649de18df..b59360de123 100644 --- a/src/egl/drivers/dri2/Makefile.am +++ b/src/egl/drivers/dri2/Makefile.am @@ -44,10 +44,6 @@ libegl_dri2_la_LIBADD = \ $(top_builddir)/src/loader/libloader.la \ $(EGL_LIB_DEPS) -if HAVE_SHARED_GLAPI -AM_CFLAGS += -DHAVE_SHARED_GLAPI -endif - if HAVE_EGL_PLATFORM_X11 libegl_dri2_la_SOURCES += platform_x11.c AM_CFLAGS += -DHAVE_X11_PLATFORM diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c index 65194cb990c..5600e8212d0 100644 --- a/src/egl/drivers/dri2/egl_dri2.c +++ b/src/egl/drivers/dri2/egl_dri2.c @@ -2365,7 +2365,6 @@ static EGLBoolean dri2_load(_EGLDriver *drv) { struct dri2_egl_driver *dri2_drv = dri2_egl_driver(drv); -#ifdef HAVE_SHARED_GLAPI #ifdef HAVE_ANDROID_PLATFORM const char *libname = "libglapi.so"; #elif defined(__APPLE__) @@ -2373,13 +2372,6 @@ dri2_load(_EGLDriver *drv) #else const char *libname = "libglapi.so.0"; #endif -#else - /* - * Both libGL.so and libglapi.so are glapi providers. There is no way to - * tell which one to load. - */ - const char *libname = NULL; -#endif void *handle; /* RTLD_GLOBAL to make sure glapi symbols are visible to DRI drivers */ |