From a99f579127db96ba0f7fb0841bfa1aa65eb1da6f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Thu, 24 Oct 2019 16:02:11 -0400 Subject: [PATCH] cogl: Remove unused cogl_check_extension and cogl_clutter_check_extension https://gitlab.gnome.org/GNOME/mutter/merge_requests/885 --- cogl/cogl/cogl.c | 7 ------- cogl/cogl/cogl1-context.h | 21 --------------------- cogl/cogl/deprecated/cogl-clutter.c | 25 ------------------------- cogl/cogl/deprecated/cogl-clutter.h | 5 ----- 4 files changed, 58 deletions(-) diff --git a/cogl/cogl/cogl.c b/cogl/cogl/cogl.c index 00796e38b..279d5b689 100644 --- a/cogl/cogl/cogl.c +++ b/cogl/cogl/cogl.c @@ -77,13 +77,6 @@ _cogl_check_extension (const char *name, char * const *ext) return FALSE; } -/* XXX: This has been deprecated as public API */ -gboolean -cogl_check_extension (const char *name, const char *ext) -{ - return cogl_clutter_check_extension (name, ext); -} - /* XXX: it's expected that we'll deprecated this with * cogl_framebuffer_clear at some point. */ void diff --git a/cogl/cogl/cogl1-context.h b/cogl/cogl/cogl1-context.h index 0d873fe76..fc660b1d9 100644 --- a/cogl/cogl/cogl1-context.h +++ b/cogl/cogl/cogl1-context.h @@ -79,27 +79,6 @@ cogl_get_option_group (void); GCallback cogl_get_proc_address (const char *name); -/** - * cogl_check_extension: - * @name: extension to check for - * @ext: list of extensions - * - * Check whether @name occurs in list of extensions in @ext. - * - * Return value: %TRUE if the extension occurs in the list, %FALSE otherwise. - * - * Deprecated: 1.2: OpenGL is an implementation detail for Cogl and so it's - * not appropriate to expose OpenGL extensions through the Cogl API. This - * function can be replaced by the following equivalent code: - * |[ - * gboolean retval = (strstr (ext, name) != NULL) ? TRUE : FALSE; - * ]| - */ -COGL_DEPRECATED -gboolean -cogl_check_extension (const char *name, - const char *ext); - /** * cogl_get_bitmasks: * @red: (out): Return location for the number of red bits or %NULL diff --git a/cogl/cogl/deprecated/cogl-clutter.c b/cogl/cogl/deprecated/cogl-clutter.c index 63899355e..a2528c8be 100644 --- a/cogl/cogl/deprecated/cogl-clutter.c +++ b/cogl/cogl/deprecated/cogl-clutter.c @@ -46,31 +46,6 @@ #include "winsys/cogl-winsys-private.h" #include "deprecated/cogl-clutter.h" -gboolean -cogl_clutter_check_extension (const char *name, const char *ext) -{ - char *end; - int name_len, n; - - if (name == NULL || ext == NULL) - return FALSE; - - end = (char*)(ext + strlen(ext)); - - name_len = strlen(name); - - while (ext < end) - { - n = strcspn(ext, " "); - - if ((name_len == n) && (!strncmp(name, ext, n))) - return TRUE; - ext += (n + 1); - } - - return FALSE; -} - gboolean cogl_clutter_winsys_has_feature (CoglWinsysFeature feature) { diff --git a/cogl/cogl/deprecated/cogl-clutter.h b/cogl/cogl/deprecated/cogl-clutter.h index 82f4cce82..2f37b4486 100644 --- a/cogl/cogl/deprecated/cogl-clutter.h +++ b/cogl/cogl/deprecated/cogl-clutter.h @@ -35,11 +35,6 @@ G_BEGIN_DECLS -#define cogl_clutter_check_extension cogl_clutter_check_extension_CLUTTER -COGL_DEPRECATED -gboolean -cogl_clutter_check_extension (const char *name, const char *ext); - #define cogl_clutter_winsys_has_feature cogl_clutter_winsys_has_feature_CLUTTER COGL_DEPRECATED_FOR (cogl_has_feature) gboolean