[mutter] cogl: Remove support for cogl.conf

[Florian Müllner <fmuellner src gnome org>]

commit 17e39ad79c8f3e0ef8c68f3cedea3931bd44ad34
Author: Adam Jackson <ajax redhat com>
Date:   Tue Oct 22 19:47:34 2019 -0400

    cogl: Remove support for cogl.conf
    
    There are still environment variables for these controls, but having
    them in a config file doesn't really make sense for mutter. Even if it
    did we probably don't want to be parsing the same file as some
    standalone version of cogl.
    
    https://gitlab.gnome.org/GNOME/mutter/merge_requests/902

 cogl/cogl/cogl-config-private.h |  45 --------------
 cogl/cogl/cogl-config.c         | 133 ----------------------------------------
 cogl/cogl/cogl-context.c        |  21 +------
 cogl/cogl/cogl-renderer.c       |   6 --
 cogl/cogl/cogl.c                |   2 -
 cogl/cogl/meson.build           |   2 -
 6 files changed, 1 insertion(+), 208 deletions(-)
---
diff --git a/cogl/cogl/cogl-context.c b/cogl/cogl/cogl-context.c
index 464e2de0e..850fdbac8 100644
--- a/cogl/cogl/cogl-context.c
+++ b/cogl/cogl/cogl-context.c
@@ -46,7 +46,6 @@
 #include "cogl-attribute-private.h"
 #include "cogl1-context.h"
 #include "cogl-gpu-info-private.h"
-#include "cogl-config-private.h"
 #include "cogl-gtype-private.h"
 #include "driver/gl/cogl-pipeline-opengl-private.h"
 #include "driver/gl/cogl-util-gl-private.h"
@@ -590,11 +589,9 @@ _cogl_context_get_gl_extensions (CoglContext *context)
       ret = g_strsplit (all_extensions, " ", 0 /* max tokens */);
     }
 
-  if ((env_disabled_extensions = g_getenv ("COGL_DISABLE_GL_EXTENSIONS"))
-      || _cogl_config_disable_gl_extensions)
+  if ((env_disabled_extensions = g_getenv ("COGL_DISABLE_GL_EXTENSIONS")))
     {
       char **split_env_disabled_extensions;
-      char **split_conf_disabled_extensions;
       char **src, **dst;
 
       if (env_disabled_extensions)
@@ -605,14 +602,6 @@ _cogl_context_get_gl_extensions (CoglContext *context)
       else
         split_env_disabled_extensions = NULL;
 
-      if (_cogl_config_disable_gl_extensions)
-        split_conf_disabled_extensions =
-          g_strsplit (_cogl_config_disable_gl_extensions,
-                      ",",
-                      0 /* no max tokens */);
-      else
-        split_conf_disabled_extensions = NULL;
-
       for (dst = ret, src = ret;
            *src;
            src++)
@@ -623,10 +612,6 @@ _cogl_context_get_gl_extensions (CoglContext *context)
             for (d = split_env_disabled_extensions; *d; d++)
               if (!strcmp (*src, *d))
                 goto disabled;
-          if (split_conf_disabled_extensions)
-            for (d = split_conf_disabled_extensions; *d; d++)
-              if (!strcmp (*src, *d))
-                goto disabled;
 
           *(dst++) = *src;
           continue;
@@ -640,8 +625,6 @@ _cogl_context_get_gl_extensions (CoglContext *context)
 
       if (split_env_disabled_extensions)
         g_strfreev (split_env_disabled_extensions);
-      if (split_conf_disabled_extensions)
-        g_strfreev (split_conf_disabled_extensions);
     }
 
   return ret;
@@ -654,8 +637,6 @@ _cogl_context_get_gl_version (CoglContext *context)
 
   if ((version_override = g_getenv ("COGL_OVERRIDE_GL_VERSION")))
     return version_override;
-  else if (_cogl_config_override_gl_version)
-    return _cogl_config_override_gl_version;
   else
     return (const char *) context->glGetString (GL_VERSION);
 
diff --git a/cogl/cogl/cogl-renderer.c b/cogl/cogl/cogl-renderer.c
index b83f8d08c..f77a26317 100644
--- a/cogl/cogl/cogl-renderer.c
+++ b/cogl/cogl/cogl-renderer.c
@@ -43,7 +43,6 @@
 #include "cogl-renderer.h"
 #include "cogl-renderer-private.h"
 #include "cogl-display-private.h"
-#include "cogl-config-private.h"
 #include "cogl-gtype-private.h"
 
 #include "winsys/cogl-winsys-private.h"
@@ -395,9 +394,6 @@ _cogl_renderer_choose_driver (CoglRenderer *renderer,
   const CoglDriverDescription *desc;
   int i;
 
-  if (!driver_name)
-    driver_name = _cogl_config_driver;
-
   if (driver_name)
     {
       driver_override = driver_name_to_id (driver_name);
@@ -568,8 +564,6 @@ cogl_renderer_connect (CoglRenderer *renderer, GError **error)
       else
         {
           char *user_choice = getenv ("COGL_RENDERER");
-          if (!user_choice)
-            user_choice = _cogl_config_renderer;
           if (user_choice &&
               g_ascii_strcasecmp (winsys->name, user_choice) != 0)
             continue;
diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c
index 6d83e523a..da4d1d247 100644
--- a/cogl/cogl/cogl.c
+++ b/cogl/cogl/cogl.c
@@ -48,7 +48,6 @@
 #include "cogl-attribute-private.h"
 #include "cogl-framebuffer-private.h"
 #include "cogl-renderer-private.h"
-#include "cogl-config-private.h"
 #include "cogl-private.h"
 #include "cogl1-context.h"
 #include "cogl-offscreen.h"
@@ -630,7 +629,6 @@ _cogl_init (void)
       g_type_init ();
 #endif
 
-      _cogl_config_read ();
       _cogl_debug_check_environment ();
       initialized = TRUE;
     }
diff --git a/cogl/cogl/meson.build b/cogl/cogl/meson.build
index 95483168e..59363b5c5 100644
--- a/cogl/cogl/meson.build
+++ b/cogl/cogl/meson.build
@@ -339,8 +339,6 @@ cogl_sources = [
   'cogl-point-in-poly.c',
   'cogl-list.c',
   'cogl-list.h',
-  'cogl-config-private.h',
-  'cogl-config.c',
   'cogl-boxed-value.h',
   'cogl-boxed-value.c',
   'cogl-snippet-private.h',