Allow overriding the list of Cogl drivers via configuration file

Clutter has a configuration file that can be used to override
various settings, including the ones from environment variables.

3 files changed, 19 insertions, 1 deletions

diff --git a/clutter/clutter-backend-private.h b/clutter/clutter-backend-private.h
index 6e1e7ec69..eb44941da 100644
--- a/clutter/clutter-backend-private.h
+++ b/clutter/clutter-backend-private.h
@@ -153,6 +153,7 @@ PangoDirection          _clutter_backend_get_keymap_direction           (Clutter
 
 void                    _clutter_backend_reset_cogl_framebuffer         (ClutterBackend         *backend);
 
+void                    clutter_set_allowed_drivers                     (const char             *drivers);
 
 G_END_DECLS
 
diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c
index 71710e395..d9ce53f1a 100644
--- a/clutter/clutter-backend.c
+++ b/clutter/clutter-backend.c
@@ -373,7 +373,7 @@ static const struct {
   { "any", "Default Cogl driver", COGL_DRIVER_ANY },
 };
 
-static char *allowed_drivers;
+static const char *allowed_drivers;
 
 static gboolean
 clutter_backend_real_create_context (ClutterBackend  *backend,
@@ -1509,3 +1509,9 @@ _clutter_backend_reset_cogl_framebuffer (ClutterBackend *backend)
 
   cogl_set_framebuffer (COGL_FRAMEBUFFER (backend->dummy_onscreen));
 }
+
+void
+clutter_set_allowed_drivers (const char *drivers)
+{
+  allowed_drivers = g_strdup (drivers);
+}
diff --git a/clutter/clutter-main.c b/clutter/clutter-main.c
index 3d2130c68..e9cf9b00b 100644
--- a/clutter/clutter-main.c
+++ b/clutter/clutter-main.c
@@ -221,6 +221,17 @@ clutter_config_read_from_key_file (GKeyFile *keyfile)
   if (!g_key_file_has_group (keyfile, ENVIRONMENT_GROUP))
     return;
 
+  str_value =
+    g_key_file_get_string (keyfile, ENVIRONMENT_GROUP,
+                           "Drivers",
+                           &key_error);
+  if (key_error != NULL)
+    g_clear_error (&key_error);
+  else
+    clutter_set_allowed_drivers (str_value);
+
+  g_free (str_value);
+
   bool_value =
     g_key_file_get_boolean (keyfile, ENVIRONMENT_GROUP,
                             "ShowFps",