OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gbm: turn GBM_ALWAYS_SOFTWARE into a boolean

Browse Source 
Instead of setting based on set/unset, allow users to use boolean values.

Signed-off-by: Eric Engestrom <eric.engestrom@imgtec.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
This commit is contained in:
Eric Engestrom
2017-09-08 11:39:43 +01:00
parent f940b1665a
commit 6ea8db5b4c
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/gbm/Android.mk
View File

@@ -32,7 +32,10 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
LOCAL_C_INCLUDES := \ LOCAL_C_INCLUDES := \
$(LOCAL_PATH)/main $(LOCAL_PATH)/main
LOCAL_STATIC_LIBRARIES := libmesa_loader LOCAL_STATIC_LIBRARIES := \
libmesa_util \
libmesa_loader
LOCAL_MODULE := libgbm LOCAL_MODULE := libgbm
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \

1
src/gbm/Makefile.am
View File

@@ -26,6 +26,7 @@ libgbm_la_LDFLAGS = \
libgbm_la_LIBADD = \ libgbm_la_LIBADD = \
$(top_builddir)/src/loader/libloader.la \ $(top_builddir)/src/loader/libloader.la \
$(top_builddir)/src/util/libmesautil.la \
$(top_builddir)/src/util/libxmlconfig.la \ $(top_builddir)/src/util/libxmlconfig.la \
$(DLOPEN_LIBS) $(DLOPEN_LIBS)

6
src/gbm/backends/dri/gbm_dri.c
View File

@@ -48,6 +48,7 @@
#include "gbmint.h" #include "gbmint.h"
#include "loader.h" #include "loader.h"
#include "util/debug.h"
#include "util/macros.h" #include "util/macros.h"
/* For importing wl_buffer */ /* For importing wl_buffer */
@@ -1336,7 +1337,8 @@ static struct gbm_device *
dri_device_create(int fd) dri_device_create(int fd)
{ {
struct gbm_dri_device *dri; struct gbm_dri_device *dri;
int ret, force_sw; int ret;
bool force_sw;
dri = calloc(1, sizeof *dri); dri = calloc(1, sizeof *dri);
if (!dri) if (!dri)
@@ -1364,7 +1366,7 @@ dri_device_create(int fd)
mtx_init(&dri->mutex, mtx_plain); 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) { if (!force_sw) {
ret = dri_screen_create(dri); ret = dri_screen_create(dri);
if (ret) if (ret)