From 3f9a8b408e5b0fd347839274cf1fc05e8b69b35e Mon Sep 17 00:00:00 2001 From: Adrian Perez de Castro Date: Thu, 4 Jan 2024 00:10:53 +0200 Subject: [PATCH] platform: Bump libwpe requirement to 1.14 Bump required libwpe version to 1.14.0, which allows dropping conditional compilation for setting target refresh rates. Always building the code reduces the testing matrix, and version 1.14.0 is over a year old so the change should not pose any issue for packagers. --- meson.build | 2 +- platform/drm/cog-platform-drm.c | 10 ---------- platform/gtk4/cog-platform-gtk4.c | 10 ---------- platform/wayland/cog-utils-wl.h | 6 ------ platform/wayland/cog-viewport-wl.c | 2 -- 5 files changed, 1 insertion(+), 29 deletions(-) diff --git a/meson.build b/meson.build index 2ad8f752..ea12350f 100644 --- a/meson.build +++ b/meson.build @@ -143,7 +143,7 @@ if cog_launcher_system_bus ) endif -wpe_dep = dependency('wpe-1.0') +wpe_dep = dependency('wpe-1.0', version: '>=1.14.0') manette_dep = dependency('manette-0.2', version: '>=0.2.4', required: false) subdir('core') diff --git a/platform/drm/cog-platform-drm.c b/platform/drm/cog-platform-drm.c index a53636e7..6bafe9ae 100644 --- a/platform/drm/cog-platform-drm.c +++ b/platform/drm/cog-platform-drm.c @@ -36,12 +36,6 @@ (LIBINPUT_VER_MAJOR == (a) && (LIBINPUT_VER_MINOR == (b)) && (LIBINPUT_VER_MICRO >= (c)))) #endif /* !LIBINPUT_CHECK_VERSION */ -#if defined(WPE_CHECK_VERSION) -# define HAVE_REFRESH_RATE_HANDLING WPE_CHECK_VERSION(1, 13, 2) -#else -# define HAVE_REFRESH_RATE_HANDLING 0 -#endif - #if !defined(EGL_EXT_platform_base) typedef EGLDisplay (EGLAPIENTRYP PFNEGLGETPLATFORMDISPLAYEXTPROC) (EGLenum platform, void *native_display, const EGLint *attrib_list); #endif @@ -1532,14 +1526,12 @@ cog_drm_platform_get_view_backend(CogPlatform *platform, WebKitWebView *related_ return wk_view_backend; } -#if HAVE_REFRESH_RATE_HANDLING static gboolean set_target_refresh_rate(gpointer user_data) { wpe_view_backend_set_target_refresh_rate(wpe_view_data.backend, drm_data.refresh * 1000); return G_SOURCE_REMOVE; } -#endif /* HAVE_REFRESH_RATE_HANDLING */ static void cog_drm_platform_init_web_view(CogPlatform *platform, WebKitWebView *view) @@ -1548,9 +1540,7 @@ cog_drm_platform_init_web_view(CogPlatform *platform, WebKitWebView *view) wpe_view_backend_dispatch_set_device_scale_factor(wpe_view_data.backend, drm_data.device_scale); -#if HAVE_REFRESH_RATE_HANDLING g_idle_add(G_SOURCE_FUNC(set_target_refresh_rate), &wpe_view_data); -#endif /* HAVE_REFRESH_RATE_HANDLING */ } static void diff --git a/platform/gtk4/cog-platform-gtk4.c b/platform/gtk4/cog-platform-gtk4.c index 21ac6472..4b7ec183 100644 --- a/platform/gtk4/cog-platform-gtk4.c +++ b/platform/gtk4/cog-platform-gtk4.c @@ -25,12 +25,6 @@ #define DEFAULT_WIDTH 1280 #define DEFAULT_HEIGHT 720 -#if defined(WPE_CHECK_VERSION) -# define HAVE_REFRESH_RATE_HANDLING WPE_CHECK_VERSION(1, 13, 2) -#else -# define HAVE_REFRESH_RATE_HANDLING 0 -#endif - struct _CogGtk4PlatformClass { CogPlatformClass parent_class; }; @@ -158,7 +152,6 @@ setup_shader(struct platform_window* window, GError** error) return true; } -#if HAVE_REFRESH_RATE_HANDLING static void enter_monitor(GdkSurface *surface, GdkMonitor *monitor, gpointer user_data) { @@ -166,7 +159,6 @@ enter_monitor(GdkSurface *surface, GdkMonitor *monitor, gpointer user_data) wpe_view_backend_set_target_refresh_rate(wpe_view_backend_exportable_fdo_get_view_backend(win->exportable), gdk_monitor_get_refresh_rate(monitor)); } -#endif /* HAVE_REFRESH_RATE_HANDLING */ static void realize(GtkWidget *widget, gpointer user_data) @@ -179,10 +171,8 @@ realize(GtkWidget *widget, gpointer user_data) g_application_quit(g_application_get_default()); } -#if HAVE_REFRESH_RATE_HANDLING g_signal_connect(gtk_native_get_surface(gtk_widget_get_native(win->gtk_window)), "enter-monitor", G_CALLBACK(enter_monitor), user_data); -#endif /* HAVE_REFRESH_RATE_HANDLING */ } static gboolean diff --git a/platform/wayland/cog-utils-wl.h b/platform/wayland/cog-utils-wl.h index ae98afbc..1adb6a15 100644 --- a/platform/wayland/cog-utils-wl.h +++ b/platform/wayland/cog-utils-wl.h @@ -26,12 +26,6 @@ G_BEGIN_DECLS #define DEFAULT_HEIGHT 768 #define DEFAULT_WIDTH 1024 -#if defined(WPE_CHECK_VERSION) -# define HAVE_REFRESH_RATE_HANDLING WPE_CHECK_VERSION(1, 13, 2) -#else -# define HAVE_REFRESH_RATE_HANDLING 0 -#endif - typedef struct _CogWlAxis CogWlAxis; typedef struct _CogWlDisplay CogWlDisplay; typedef struct _CogWlKeyboard CogWlKeyboard; diff --git a/platform/wayland/cog-viewport-wl.c b/platform/wayland/cog-viewport-wl.c index ce9d54c5..fab316d3 100644 --- a/platform/wayland/cog-viewport-wl.c +++ b/platform/wayland/cog-viewport-wl.c @@ -127,9 +127,7 @@ surface_on_enter(void *data, struct wl_surface *surface, struct wl_output *outpu for (unsigned i = 0; i < cog_viewport_get_n_views(COG_VIEWPORT(viewport)); i++) { struct wpe_view_backend *backend = cog_view_get_backend(cog_viewport_get_nth_view(COG_VIEWPORT(viewport), i)); -#if HAVE_REFRESH_RATE_HANDLING wpe_view_backend_set_target_refresh_rate(backend, display->current_output->refresh); -#endif /* HAVE_REFRESH_RATE_HANDLING */ #ifdef WL_SURFACE_SET_BUFFER_SCALE_SINCE_VERSION if (can_set_surface_scale)