diff options
| -rw-r--r-- | src/gbm/Android.mk | 5 | ||||
| -rw-r--r-- | src/gbm/Makefile.am | 1 | ||||
| -rw-r--r-- | src/gbm/backends/dri/gbm_dri.c | 6 |
3 files changed, 9 insertions, 3 deletions
diff --git a/src/gbm/Android.mk b/src/gbm/Android.mk index a3f8fbbeabc..1fe56524322 100644 --- a/src/gbm/Android.mk +++ b/src/gbm/Android.mk @@ -32,7 +32,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/main -LOCAL_STATIC_LIBRARIES := libmesa_loader +LOCAL_STATIC_LIBRARIES := \ + libmesa_util \ + libmesa_loader + LOCAL_MODULE := libgbm LOCAL_SRC_FILES := \ diff --git a/src/gbm/Makefile.am b/src/gbm/Makefile.am index 7a9a12f87a0..f5fa81c7c96 100644 --- a/src/gbm/Makefile.am +++ b/src/gbm/Makefile.am @@ -26,6 +26,7 @@ libgbm_la_LDFLAGS = \ libgbm_la_LIBADD = \ $(top_builddir)/src/loader/libloader.la \ + $(top_builddir)/src/util/libmesautil.la \ $(top_builddir)/src/util/libxmlconfig.la \ $(DLOPEN_LIBS) diff --git a/src/gbm/backends/dri/gbm_dri.c b/src/gbm/backends/dri/gbm_dri.c index 1b2cc4ce765..46285245658 100644 --- a/src/gbm/backends/dri/gbm_dri.c +++ b/src/gbm/backends/dri/gbm_dri.c @@ -48,6 +48,7 @@ #include "gbmint.h" #include "loader.h" +#include "util/debug.h" #include "util/macros.h" /* For importing wl_buffer */ @@ -1336,7 +1337,8 @@ static struct gbm_device * dri_device_create(int fd) { struct gbm_dri_device *dri; - int ret, force_sw; + int ret; + bool force_sw; dri = calloc(1, sizeof *dri); if (!dri) @@ -1364,7 +1366,7 @@ dri_device_create(int fd) mtx_init(&dri->mutex, mtx_plain); - force_sw = getenv("GBM_ALWAYS_SOFTWARE") != NULL; + force_sw = env_var_as_boolean("GBM_ALWAYS_SOFTWARE", false); if (!force_sw) { ret = dri_screen_create(dri); if (ret) |