From 1c24b1182ba39cb8c508580713336dcf79e6a295 Mon Sep 17 00:00:00 2001
From: Simon Ser <contact@emersion.fr>
Date: Mon, 30 Oct 2023 18:37:13 +0100
Subject: backend: drop wlr_backend_get_presentation_clock()

We can just assume CLOCK_MONOTONIC everywhere.

Simplifies the backend API, and fixes clock mismatches when multiple
backends are used together with different clocks.
---
 include/backend/drm/drm.h                 | 2 --
 include/backend/wayland.h                 | 1 -
 include/wlr/backend.h                     | 4 ----
 include/wlr/backend/interface.h           | 2 --
 include/wlr/types/wlr_presentation_time.h | 1 -
 5 files changed, 10 deletions(-)

(limited to 'include')

diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index 69416925..c7dd70f8 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -4,7 +4,6 @@
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
-#include <time.h>
 #include <wayland-server-core.h>
 #include <wayland-util.h>
 #include <wlr/backend/drm.h>
@@ -79,7 +78,6 @@ struct wlr_drm_backend {
 
 	struct wlr_drm_backend *parent;
 	const struct wlr_drm_interface *iface;
-	clockid_t clock;
 	bool addfb2_modifiers;
 
 	int fd;
diff --git a/include/backend/wayland.h b/include/backend/wayland.h
index a51595ec..d6796b44 100644
--- a/include/backend/wayland.h
+++ b/include/backend/wayland.h
@@ -43,7 +43,6 @@ struct wlr_wl_backend {
 	struct zwp_relative_pointer_manager_v1 *zwp_relative_pointer_manager_v1;
 	struct wl_list seats; // wlr_wl_seat.link
 	struct zwp_tablet_manager_v2 *tablet_manager;
-	clockid_t presentation_clock;
 	struct wlr_drm_format_set shm_formats;
 	struct wlr_drm_format_set linux_dmabuf_v1_formats;
 	struct wl_drm *legacy_drm;
diff --git a/include/wlr/backend.h b/include/wlr/backend.h
index fac49f06..9a8a2d87 100644
--- a/include/wlr/backend.h
+++ b/include/wlr/backend.h
@@ -51,10 +51,6 @@ bool wlr_backend_start(struct wlr_backend *backend);
  * automatically when the struct wl_display is destroyed.
  */
 void wlr_backend_destroy(struct wlr_backend *backend);
-/**
- * Returns the clock used by the backend for presentation feedback.
- */
-clockid_t wlr_backend_get_presentation_clock(struct wlr_backend *backend);
 /**
  * Returns the DRM node file descriptor used by the backend's underlying
  * platform. Can be used by consumers for additional rendering operations.
diff --git a/include/wlr/backend/interface.h b/include/wlr/backend/interface.h
index 8b922f1d..da57cae9 100644
--- a/include/wlr/backend/interface.h
+++ b/include/wlr/backend/interface.h
@@ -10,13 +10,11 @@
 #define WLR_BACKEND_INTERFACE_H
 
 #include <stdbool.h>
-#include <time.h>
 #include <wlr/backend.h>
 
 struct wlr_backend_impl {
 	bool (*start)(struct wlr_backend *backend);
 	void (*destroy)(struct wlr_backend *backend);
-	clockid_t (*get_presentation_clock)(struct wlr_backend *backend);
 	int (*get_drm_fd)(struct wlr_backend *backend);
 	uint32_t (*get_buffer_caps)(struct wlr_backend *backend);
 };
diff --git a/include/wlr/types/wlr_presentation_time.h b/include/wlr/types/wlr_presentation_time.h
index a8df292d..9543cff6 100644
--- a/include/wlr/types/wlr_presentation_time.h
+++ b/include/wlr/types/wlr_presentation_time.h
@@ -21,7 +21,6 @@ struct wlr_output_event_present;
 
 struct wlr_presentation {
 	struct wl_global *global;
-	clockid_t clock;
 
 	struct {
 		struct wl_signal destroy;
-- 
cgit v1.2.3