Merge pull request #882 from emersion/unprefix-local-symbols

Remove wlr_ prefix from local symbols

4 files changed, 26 insertions, 28 deletions

diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h
index cb10ad20..5d6ff231 100644
--- a/include/backend/drm/drm.h
+++ b/include/backend/drm/drm.h
@@ -136,17 +136,12 @@ struct wlr_drm_connector {
 	struct wl_list link;
 };
 
-bool wlr_drm_check_features(struct wlr_drm_backend *drm);
-bool wlr_drm_resources_init(struct wlr_drm_backend *drm);
-void wlr_drm_resources_free(struct wlr_drm_backend *drm);
-void wlr_drm_restore_outputs(struct wlr_drm_backend *drm);
-void wlr_drm_connector_cleanup(struct wlr_drm_connector *conn);
-void wlr_drm_scan_connectors(struct wlr_drm_backend *state);
-int wlr_drm_event(int fd, uint32_t mask, void *data);
-void wlr_drm_connector_enable(struct wlr_output *output, bool enable);
-
-void wlr_drm_connector_start_renderer(struct wlr_drm_connector *conn);
-
-struct wlr_session *wlr_drm_backend_get_session(struct wlr_backend *backend);
+bool check_drm_features(struct wlr_drm_backend *drm);
+bool init_drm_resources(struct wlr_drm_backend *drm);
+void finish_drm_resources(struct wlr_drm_backend *drm);
+void restore_drm_outputs(struct wlr_drm_backend *drm);
+void scan_drm_connectors(struct wlr_drm_backend *state);
+int handle_drm_event(int fd, uint32_t mask, void *data);
+void enable_drm_connector(struct wlr_output *output, bool enable);
 
 #endif
diff --git a/include/backend/drm/properties.h b/include/backend/drm/properties.h
index 3cf8cc87..1b3b2241 100644
--- a/include/backend/drm/properties.h
+++ b/include/backend/drm/properties.h
@@ -59,11 +59,12 @@ union wlr_drm_plane_props {
 	uint32_t props[12];
 };
 
-bool wlr_drm_get_connector_props(int fd, uint32_t id, union wlr_drm_connector_props *out);
-bool wlr_drm_get_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out);
-bool wlr_drm_get_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out);
+bool get_drm_connector_props(int fd, uint32_t id,
+	union wlr_drm_connector_props *out);
+bool get_drm_crtc_props(int fd, uint32_t id, union wlr_drm_crtc_props *out);
+bool get_drm_plane_props(int fd, uint32_t id, union wlr_drm_plane_props *out);
 
-bool wlr_drm_get_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret);
-void *wlr_drm_get_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len);
+bool get_drm_prop(int fd, uint32_t obj, uint32_t prop, uint64_t *ret);
+void *get_drm_prop_blob(int fd, uint32_t obj, uint32_t prop, size_t *ret_len);
 
 #endif
diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h
index 73adfc27..5e15f3d5 100644
--- a/include/backend/drm/renderer.h
+++ b/include/backend/drm/renderer.h
@@ -31,25 +31,25 @@ struct wlr_drm_surface {
 	struct gbm_bo *back;
 };
 
-bool wlr_drm_renderer_init(struct wlr_drm_backend *drm,
+bool init_drm_renderer(struct wlr_drm_backend *drm,
 	struct wlr_drm_renderer *renderer);
-void wlr_drm_renderer_finish(struct wlr_drm_renderer *renderer);
+void finish_drm_renderer(struct wlr_drm_renderer *renderer);
 
-bool wlr_drm_surface_init(struct wlr_drm_surface *surf,
+bool init_drm_surface(struct wlr_drm_surface *surf,
 	struct wlr_drm_renderer *renderer, uint32_t width, uint32_t height,
 	uint32_t format, uint32_t flags);
 
-bool wlr_drm_plane_surfaces_init(struct wlr_drm_plane *plane,
+bool init_drm_plane_surfaces(struct wlr_drm_plane *plane,
 	struct wlr_drm_backend *drm, int32_t width, uint32_t height,
 	uint32_t format);
 
-void wlr_drm_surface_finish(struct wlr_drm_surface *surf);
-bool wlr_drm_surface_make_current(struct wlr_drm_surface *surf, int *buffer_age);
-struct gbm_bo *wlr_drm_surface_swap_buffers(struct wlr_drm_surface *surf,
+void finish_drm_surface(struct wlr_drm_surface *surf);
+bool make_drm_surface_current(struct wlr_drm_surface *surf, int *buffer_age);
+struct gbm_bo *swap_drm_surface_buffers(struct wlr_drm_surface *surf,
 	pixman_region32_t *damage);
-struct gbm_bo *wlr_drm_surface_get_front(struct wlr_drm_surface *surf);
-void wlr_drm_surface_post(struct wlr_drm_surface *surf);
-struct gbm_bo *wlr_drm_surface_mgpu_copy(struct wlr_drm_surface *dest,
+struct gbm_bo *get_drm_surface_front(struct wlr_drm_surface *surf);
+void post_drm_surface(struct wlr_drm_surface *surf);
+struct gbm_bo *copy_drm_surface_mgpu(struct wlr_drm_surface *dest,
 	struct gbm_bo *src);
 
 #endif
diff --git a/include/backend/drm/util.h b/include/backend/drm/util.h
index 25da858f..0b55182b 100644
--- a/include/backend/drm/util.h
+++ b/include/backend/drm/util.h
@@ -9,7 +9,8 @@
 // Calculates a more accurate refresh rate (mHz) than what mode itself provides
 int32_t calculate_refresh_rate(drmModeModeInfo *mode);
 // Populates the make/model/phys_{width,height} of output from the edid data
-void parse_edid(struct wlr_output *restrict output, size_t len, const uint8_t *data);
+void parse_edid(struct wlr_output *restrict output, size_t len,
+	const uint8_t *data);
 // Returns the string representation of a DRM output type
 const char *conn_get_name(uint32_t type_id);
 // Returns the DRM framebuffer id for a gbm_bo
@@ -36,4 +37,5 @@ enum {
 size_t match_obj(size_t num_objs, const uint32_t objs[static restrict num_objs],
 		size_t num_res, const uint32_t res[static restrict num_res],
 		uint32_t out[static restrict num_res]);
+
 #endif