From 74917e1b07d6201beb4cd94b109ab88815122373 Mon Sep 17 00:00:00 2001 From: Sebastian Wick Date: Wed, 31 Jul 2024 13:46:44 +0200 Subject: [PATCH] cogl/gl: Use g_auto (GStrv) and g_autofree in more cases Part-of: --- cogl/cogl/driver/gl/gl/cogl-driver-gl.c | 8 ++------ cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 10 ++-------- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c index 6bc944a17..e6fdd89bf 100644 --- a/cogl/cogl/driver/gl/gl/cogl-driver-gl.c +++ b/cogl/cogl/driver/gl/gl/cogl-driver-gl.c @@ -420,7 +420,7 @@ _cogl_driver_update_features (CoglContext *ctx, { unsigned long private_features [COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)] = { 0 }; - char **gl_extensions; + g_auto (GStrv) gl_extensions = 0; const char *glsl_version; int gl_major = 0, gl_minor = 0; int i; @@ -445,7 +445,7 @@ _cogl_driver_update_features (CoglContext *ctx, if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_WINSYS))) { - char *all_extensions = g_strjoinv (" ", gl_extensions); + g_autofree char *all_extensions = g_strjoinv (" ", gl_extensions); COGL_NOTE (WINSYS, "Checking features\n" @@ -457,8 +457,6 @@ _cogl_driver_update_features (CoglContext *ctx, ctx->glGetString (GL_RENDERER), _cogl_context_get_gl_version (ctx), all_extensions); - - g_free (all_extensions); } _cogl_get_gl_version (ctx, &gl_major, &gl_minor); @@ -543,8 +541,6 @@ _cogl_driver_update_features (CoglContext *ctx, for (i = 0; i < G_N_ELEMENTS (private_features); i++) ctx->private_features[i] |= private_features[i]; - g_strfreev (gl_extensions); - if (!COGL_FLAGS_GET (private_features, COGL_PRIVATE_FEATURE_TEXTURE_SWIZZLE)) { g_set_error (error, diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c index 770ac9fe5..dda16bc73 100644 --- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c +++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c @@ -570,7 +570,7 @@ _cogl_driver_update_features (CoglContext *context, { unsigned long private_features [COGL_FLAGS_N_LONGS_FOR_SIZE (COGL_N_PRIVATE_FEATURES)] = { 0 }; - char **gl_extensions; + g_auto (GStrv) gl_extensions = 0; int gl_major, gl_minor; int i; @@ -588,7 +588,7 @@ _cogl_driver_update_features (CoglContext *context, if (G_UNLIKELY (COGL_DEBUG_ENABLED (COGL_DEBUG_WINSYS))) { - char *all_extensions = g_strjoinv (" ", gl_extensions); + g_autofree char *all_extensions = g_strjoinv (" ", gl_extensions); COGL_NOTE (WINSYS, "Checking features\n" @@ -600,8 +600,6 @@ _cogl_driver_update_features (CoglContext *context, context->glGetString (GL_RENDERER), _cogl_context_get_gl_version (context), all_extensions); - - g_free (all_extensions); } context->glsl_major = 1; @@ -620,7 +618,6 @@ _cogl_driver_update_features (CoglContext *context, COGL_DRIVER_ERROR, COGL_DRIVER_ERROR_INVALID_VERSION, "OpenGL ES 2.0 or better is required"); - g_strfreev (gl_extensions); return FALSE; } @@ -636,7 +633,6 @@ _cogl_driver_update_features (CoglContext *context, COGL_DRIVER_ERROR, COGL_DRIVER_ERROR_INVALID_VERSION, "GL_OES_rgb8_rgba8 is required for GLES 2"); - g_strfreev (gl_extensions); return FALSE; } @@ -752,8 +748,6 @@ _cogl_driver_update_features (CoglContext *context, for (i = 0; i < G_N_ELEMENTS (private_features); i++) context->private_features[i] |= private_features[i]; - g_strfreev (gl_extensions); - return TRUE; }