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

Fix const qualifier usage

Browse Source 
As with the commits earlier, this also adds const qualifiers where
expected. However, the const variables are casted to non-const variants
so they can be passed to glib functions that take non-const variants but
expect const-like input.
This commit is contained in:
Jonas Ådahl 2019-01-20 11:46:46 +01:00
parent f615eea7ee
commit 01cea0d9ef
7 changed files with 40 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/backends/meta-egl.c
View File

@ -161,13 +161,13 @@ set_egl_error (GError **error)
} }
gboolean gboolean
meta_extensions_string_has_extensions_valist (const char *extensions_str, meta_extensions_string_has_extensions_valist (const char *extensions_str,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
va_list var_args) va_list var_args)
{ {
char **extensions; char **extensions;
char *extension; const char *extension;
size_t num_missing_extensions = 0; size_t num_missing_extensions = 0;
if (missing_extensions) if (missing_extensions)
@ -203,10 +203,10 @@ meta_extensions_string_has_extensions_valist (const char *extensions_str,
} }
gboolean gboolean
meta_egl_has_extensions (MetaEgl *egl, meta_egl_has_extensions (MetaEgl *egl,
EGLDisplay display, EGLDisplay display,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
...) ...)
{ {
va_list var_args; va_list var_args;
@ -669,10 +669,10 @@ meta_egl_query_device_string (MetaEgl *egl,
} }
gboolean gboolean
meta_egl_egl_device_has_extensions (MetaEgl *egl, meta_egl_egl_device_has_extensions (MetaEgl *egl,
EGLDeviceEXT device, EGLDeviceEXT device,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
...) ...)
{ {
va_list var_args; va_list var_args;

24
src/backends/meta-egl.h
View File

@ -37,15 +37,15 @@ G_DECLARE_FINAL_TYPE (MetaEgl, meta_egl, META, EGL, GObject)
GQuark meta_egl_error_quark (void); GQuark meta_egl_error_quark (void);
gboolean gboolean
meta_extensions_string_has_extensions_valist (const char *extensions_str, meta_extensions_string_has_extensions_valist (const char *extensions_str,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
va_list var_args); va_list var_args);
gboolean meta_egl_has_extensions (MetaEgl *egl, gboolean meta_egl_has_extensions (MetaEgl *egl,
EGLDisplay display, EGLDisplay display,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
...); ...);
gboolean meta_egl_initialize (MetaEgl *egl, gboolean meta_egl_initialize (MetaEgl *egl,
@ -158,10 +158,10 @@ const char * meta_egl_query_device_string (MetaEgl *egl,
EGLint name, EGLint name,
GError **error); GError **error);
gboolean meta_egl_egl_device_has_extensions (MetaEgl *egl, gboolean meta_egl_egl_device_has_extensions (MetaEgl *egl,
EGLDeviceEXT device, EGLDeviceEXT device,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
...); ...);
gboolean meta_egl_get_output_layers (MetaEgl *egl, gboolean meta_egl_get_output_layers (MetaEgl *egl,

6
src/backends/meta-gles3.c
View File

@ -114,9 +114,9 @@ meta_gles3_validate (MetaGles3 *gles3,
} }
gboolean gboolean
meta_gles3_has_extensions (MetaGles3 *gles3, meta_gles3_has_extensions (MetaGles3 *gles3,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
...) ...)
{ {
va_list var_args; va_list var_args;

6
src/backends/meta-gles3.h
View File

@ -43,9 +43,9 @@ void meta_gles3_ensure_loaded (MetaGles3 *gles,
gpointer *func, gpointer *func,
const char *name); const char *name);
gboolean meta_gles3_has_extensions (MetaGles3 *gles3, gboolean meta_gles3_has_extensions (MetaGles3 *gles3,
char ***missing_extensions, const char ***missing_extensions,
char *first_extension, const char *first_extension,
...); ...);
MetaGles3 * meta_gles3_new (MetaEgl *egl); MetaGles3 * meta_gles3_new (MetaEgl *egl);

13
src/backends/native/meta-renderer-native.c
View File

@ -3207,7 +3207,7 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
EGLDisplay egl_display = renderer_gpu_data->egl_display; EGLDisplay egl_display = renderer_gpu_data->egl_display;
EGLConfig egl_config; EGLConfig egl_config;
EGLContext egl_context; EGLContext egl_context;
char **missing_gl_extensions; const char **missing_gl_extensions;
const char *renderer_str; const char *renderer_str;
gboolean is_hardware; gboolean is_hardware;
@ -3247,7 +3247,8 @@ init_secondary_gpu_data_gpu (MetaRendererNativeGpuData *renderer_gpu_data,
{ {
char *missing_gl_extensions_str; char *missing_gl_extensions_str;
missing_gl_extensions_str = g_strjoinv (", ", missing_gl_extensions); missing_gl_extensions_str = g_strjoinv (", ",
(char **) missing_gl_extensions);
g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED, g_set_error (error, G_IO_ERROR, G_IO_ERROR_FAILED,
"Missing OpenGL ES extensions: %s", "Missing OpenGL ES extensions: %s",
missing_gl_extensions_str); missing_gl_extensions_str);
@ -3381,7 +3382,7 @@ find_egl_device (MetaRendererNative *renderer_native,
GError **error) GError **error)
{ {
MetaEgl *egl = meta_renderer_native_get_egl (renderer_native); MetaEgl *egl = meta_renderer_native_get_egl (renderer_native);
char **missing_extensions; const char **missing_extensions;
EGLint num_devices; EGLint num_devices;
EGLDeviceEXT *devices; EGLDeviceEXT *devices;
const char *kms_file_path; const char *kms_file_path;
@ -3396,7 +3397,7 @@ find_egl_device (MetaRendererNative *renderer_native,
{ {
char *missing_extensions_str; char *missing_extensions_str;
missing_extensions_str = g_strjoinv (", ", missing_extensions); missing_extensions_str = g_strjoinv (", ", (char **) missing_extensions);
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
G_IO_ERROR_FAILED, G_IO_ERROR_FAILED,
"Missing EGL extensions required for EGLDevice renderer: %s", "Missing EGL extensions required for EGLDevice renderer: %s",
@ -3484,7 +3485,7 @@ create_renderer_gpu_data_egl_device (MetaRendererNative *renderer_native,
GError **error) GError **error)
{ {
MetaEgl *egl = meta_renderer_native_get_egl (renderer_native); MetaEgl *egl = meta_renderer_native_get_egl (renderer_native);
char **missing_extensions; const char **missing_extensions;
EGLDeviceEXT egl_device; EGLDeviceEXT egl_device;
EGLDisplay egl_display; EGLDisplay egl_display;
MetaRendererNativeGpuData *renderer_gpu_data; MetaRendererNativeGpuData *renderer_gpu_data;
@ -3523,7 +3524,7 @@ create_renderer_gpu_data_egl_device (MetaRendererNative *renderer_native,
{ {
char *missing_extensions_str; char *missing_extensions_str;
missing_extensions_str = g_strjoinv (", ", missing_extensions); missing_extensions_str = g_strjoinv (", ", (char **) missing_extensions);
g_set_error (error, G_IO_ERROR, g_set_error (error, G_IO_ERROR,
G_IO_ERROR_FAILED, G_IO_ERROR_FAILED,
"Missing EGL extensions required for EGLDevice renderer: %s", "Missing EGL extensions required for EGLDevice renderer: %s",

2
src/wayland/meta-wayland.c
View File

@ -356,7 +356,7 @@ meta_xwayland_global_filter (const struct wl_client *client,
} }
void void
meta_wayland_override_display_name (char *display_name) meta_wayland_override_display_name (const char *display_name)
{ {
g_clear_pointer (&_display_name_override, g_free); g_clear_pointer (&_display_name_override, g_free);
_display_name_override = g_strdup (display_name); _display_name_override = g_strdup (display_name);

2
src/wayland/meta-wayland.h
View File

@ -27,7 +27,7 @@
#include "meta/types.h" #include "meta/types.h"
#include "wayland/meta-wayland-types.h" #include "wayland/meta-wayland-types.h"
void meta_wayland_override_display_name (char *display_name); void meta_wayland_override_display_name (const char *display_name);
void meta_wayland_pre_clutter_init (void); void meta_wayland_pre_clutter_init (void);
void meta_wayland_init (void); void meta_wayland_init (void);