brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add a configuration option for deciding the Cogl drivers to use

Browse Source 
Using environment variables only is not convenient for all platforms,
and in some cases it's beneficial to decide the default driver when
building Clutter. Cogl already has a similar configuration switch, and
since Clutter is overriding the default Cogl behaviour, it should offer
the same mechanism.

https://bugzilla.gnome.org/show_bug.cgi?id=742678
This commit is contained in:
Emmanuele Bassi 2015-12-09 14:26:28 +00:00
parent 2c524fbf73
commit bb23335b5f
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
clutter/clutter-backend.c
View File

@ -386,7 +386,7 @@ clutter_backend_real_create_context (ClutterBackend *backend,
int i; int i;
if (allowed_drivers == NULL) if (allowed_drivers == NULL)
allowed_drivers = "*"; allowed_drivers = CLUTTER_DRIVERS;
allow_any = strstr (allowed_drivers, "*") != NULL; allow_any = strstr (allowed_drivers, "*") != NULL;

9
configure.ac
View File

@ -585,6 +585,13 @@ dnl other tools such as glib-mkenums and gir-scanner don't end up
dnl using the define also. dnl using the define also.
AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1], [Can use Cogl 2.0 API internally]) AC_DEFINE([COGL_ENABLE_EXPERIMENTAL_2_0_API], [1], [Can use Cogl 2.0 API internally])
AC_ARG_WITH([default-drivers],
[AS_HELP_STRING([--with-default-drivers=DRIVER], [Comma-separated list of Cogl drivers to use])],
[clutter_drivers=$withval],
[clutter_drivers="*"])
AC_DEFINE_UNQUOTED([CLUTTER_DRIVERS], ["$clutter_drivers"], [List of Cogl drivers])
dnl strip leading spaces dnl strip leading spaces
CLUTTER_BACKENDS=${CLUTTER_BACKENDS#* } CLUTTER_BACKENDS=${CLUTTER_BACKENDS#* }
AC_SUBST(CLUTTER_BACKENDS) AC_SUBST(CLUTTER_BACKENDS)
@ -1285,6 +1292,8 @@ else
echo " Input backends: ${CLUTTER_INPUT_BACKENDS} (WARNING: Experimental backends enabled)" echo " Input backends: ${CLUTTER_INPUT_BACKENDS} (WARNING: Experimental backends enabled)"
fi fi
echo " Cogl drivers: $clutter_drivers"
if test "x$SUPPORT_X11" = "x1"; then if test "x$SUPPORT_X11" = "x1"; then
echo "" echo ""
echo " - X11 backend options:" echo " - X11 backend options:"