diff --git a/.gitignore b/.gitignore index 9fd6ccf21e75..84cfed500c9e 100644 --- a/.gitignore +++ b/.gitignore @@ -236,7 +236,7 @@ gfx/common/wayland/cursor-shape-v1.c gfx/common/wayland/tablet-unstable-v2.h gfx/common/wayland/tablet-unstable-v2.c gfx/common/wayland/content-type-v1.h -gfx/common/wayland/conent-type-v1.c +gfx/common/wayland/content-type-v1.c # libretro-common samples libretro-common/samples/streams/rzip/rzip diff --git a/gfx/common/wayland_common.c b/gfx/common/wayland_common.c index a28d8bdaea85..486238aca5bb 100644 --- a/gfx/common/wayland_common.c +++ b/gfx/common/wayland_common.c @@ -313,8 +313,8 @@ void gfx_ctx_wl_destroy_resources_common(gfx_ctx_wayland_data_t *wl) zwp_relative_pointer_manager_v1_destroy (wl->relative_pointer_manager); if (wl->content_type_manager) wp_content_type_manager_v1_destroy (wl->content_type_manager); - if (wl->content_type_v1) - wp_content_type_v1_destroy (wl->content_type_v1); + if (wl->content_type) + wp_content_type_v1_destroy (wl->content_type); if (wl->cursor_shape_manager) wp_cursor_shape_manager_v1_destroy (wl->cursor_shape_manager); if (wl->cursor_shape_device) @@ -366,7 +366,7 @@ void gfx_ctx_wl_destroy_resources_common(gfx_ctx_wayland_data_t *wl) wl->seat = NULL; wl->relative_pointer_manager = NULL; wl->pointer_constraints = NULL; - wl->content_type_v1 = NULL; + wl->content_type = NULL; wl->content_type_manager = NULL; wl->cursor_shape_manager = NULL; wl->cursor_shape_device = NULL; @@ -729,8 +729,8 @@ bool gfx_ctx_wl_init_common( if (wl->content_type_manager) { - wl->content_type_v1 = wp_content_type_manager_v1_get_surface_content_type(wl->content_type_manager, wl->surface); - wp_content_type_v1_set_content_type(wl->content_type_v1, WP_CONTENT_TYPE_V1_TYPE_GAME); + wl->content_type = wp_content_type_manager_v1_get_surface_content_type(wl->content_type_manager, wl->surface); + wp_content_type_v1_set_content_type(wl->content_type, WP_CONTENT_TYPE_V1_TYPE_GAME); } wl_surface_add_listener(wl->surface, &wl_surface_listener, wl); diff --git a/input/common/wayland_common.h b/input/common/wayland_common.h index 956d45c5c62a..9b7a143f0b13 100644 --- a/input/common/wayland_common.h +++ b/input/common/wayland_common.h @@ -186,7 +186,7 @@ typedef struct gfx_ctx_wayland_data struct wp_cursor_shape_manager_v1 *cursor_shape_manager; struct wp_cursor_shape_device_v1 *cursor_shape_device; struct wp_content_type_manager_v1 *content_type_manager; - struct wp_content_type_v1 *content_type_v1; + struct wp_content_type_v1 *content_type; output_info_t *current_output; #ifdef HAVE_VULKAN gfx_ctx_vulkan_data_t vk;