aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Zeni <simon@bl4ckb0ne.ca>2021-11-09 09:42:22 -0500
committerSimon Ser <contact@emersion.fr>2021-11-09 15:26:36 +0000
commit02a1ae169e66f53f2174add581c19d165d8ba882 (patch)
tree5468f7f8d49c058265da009700474e21015882be
parentab16861e8670c9d80a6188e7d878bb095c9b56ad (diff)
render/allocator: make wlr_allocator part of the public API
-rw-r--r--include/render/allocator/allocator.h47
-rw-r--r--include/wlr/render/allocator.h58
-rw-r--r--render/allocator/allocator.c1
-rw-r--r--render/allocator/drm_dumb.c6
-rw-r--r--render/allocator/gbm.c3
-rw-r--r--render/allocator/shm.c3
6 files changed, 70 insertions, 48 deletions
diff --git a/include/render/allocator/allocator.h b/include/render/allocator/allocator.h
index 5d8028cb..2abdd43d 100644
--- a/include/render/allocator/allocator.h
+++ b/include/render/allocator/allocator.h
@@ -1,52 +1,7 @@
#ifndef RENDER_ALLOCATOR_ALLOCATOR_H
#define RENDER_ALLOCATOR_ALLOCATOR_H
-#include <stdbool.h>
-#include <wayland-server-core.h>
-#include <wlr/render/drm_format_set.h>
-
-struct wlr_allocator;
-struct wlr_backend;
-struct wlr_renderer;
-
-struct wlr_allocator_interface {
- struct wlr_buffer *(*create_buffer)(struct wlr_allocator *alloc,
- int width, int height, const struct wlr_drm_format *format);
- void (*destroy)(struct wlr_allocator *alloc);
-};
-
-struct wlr_allocator {
- const struct wlr_allocator_interface *impl;
-
- // Capabilities of the buffers created with this allocator
- uint32_t buffer_caps;
-
- struct {
- struct wl_signal destroy;
- } events;
-};
-
-/**
- * Creates the adequate wlr_allocator given a backend and a renderer
- */
-struct wlr_allocator *wlr_allocator_autocreate(struct wlr_backend *backend,
- struct wlr_renderer *renderer);
-/**
- * Destroy the allocator.
- */
-void wlr_allocator_destroy(struct wlr_allocator *alloc);
-/**
- * Allocate a new buffer.
- *
- * When the caller is done with it, they must unreference it by calling
- * wlr_buffer_drop.
- */
-struct wlr_buffer *wlr_allocator_create_buffer(struct wlr_allocator *alloc,
- int width, int height, const struct wlr_drm_format *format);
-
-// For wlr_allocator implementors
-void wlr_allocator_init(struct wlr_allocator *alloc,
- const struct wlr_allocator_interface *impl, uint32_t buffer_caps);
+#include <wlr/render/allocator.h>
struct wlr_allocator *allocator_autocreate_with_drm_fd(
struct wlr_backend *backend, struct wlr_renderer *renderer, int drm_fd);
diff --git a/include/wlr/render/allocator.h b/include/wlr/render/allocator.h
new file mode 100644
index 00000000..3caeffa0
--- /dev/null
+++ b/include/wlr/render/allocator.h
@@ -0,0 +1,58 @@
+/*
+ * This an unstable interface of wlroots. No guarantees are made regarding the
+ * future consistency of this API.
+ */
+#ifndef WLR_USE_UNSTABLE
+#error "Add -DWLR_USE_UNSTABLE to enable unstable wlroots features"
+#endif
+
+#ifndef WLR_ALLOCATOR_H
+#define WLR_ALLOCATOR_H
+
+#include <wayland-server-core.h>
+
+struct wlr_allocator;
+struct wlr_backend;
+struct wlr_drm_format;
+struct wlr_renderer;
+
+struct wlr_allocator_interface {
+ struct wlr_buffer *(*create_buffer)(struct wlr_allocator *alloc,
+ int width, int height, const struct wlr_drm_format *format);
+ void (*destroy)(struct wlr_allocator *alloc);
+};
+
+void wlr_allocator_init(struct wlr_allocator *alloc,
+ const struct wlr_allocator_interface *impl, uint32_t buffer_caps);
+
+struct wlr_allocator {
+ const struct wlr_allocator_interface *impl;
+
+ // Capabilities of the buffers created with this allocator
+ uint32_t buffer_caps;
+
+ struct {
+ struct wl_signal destroy;
+ } events;
+};
+
+/**
+ * Creates the adequate wlr_allocator given a backend and a renderer
+ */
+struct wlr_allocator *wlr_allocator_autocreate(struct wlr_backend *backend,
+ struct wlr_renderer *renderer);
+/**
+ * Destroy the allocator.
+ */
+void wlr_allocator_destroy(struct wlr_allocator *alloc);
+
+/**
+ * Allocate a new buffer.
+ *
+ * When the caller is done with it, they must unreference it by calling
+ * wlr_buffer_drop.
+ */
+struct wlr_buffer *wlr_allocator_create_buffer(struct wlr_allocator *alloc,
+ int width, int height, const struct wlr_drm_format *format);
+
+#endif
diff --git a/render/allocator/allocator.c b/render/allocator/allocator.c
index 0244e07a..15d55a0d 100644
--- a/render/allocator/allocator.c
+++ b/render/allocator/allocator.c
@@ -3,6 +3,7 @@
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
+#include <wlr/render/allocator.h>
#include <wlr/util/log.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
diff --git a/render/allocator/drm_dumb.c b/render/allocator/drm_dumb.c
index 170d9c33..5b47462b 100644
--- a/render/allocator/drm_dumb.c
+++ b/render/allocator/drm_dumb.c
@@ -7,11 +7,13 @@
#include <string.h>
#include <sys/mman.h>
#include <unistd.h>
+#include <wlr/backend.h>
+#include <wlr/backend/session.h>
+#include <wlr/render/allocator.h>
+#include <wlr/render/drm_format_set.h>
#include <wlr/util/log.h>
#include <xf86drm.h>
#include <xf86drmMode.h>
-#include <wlr/backend.h>
-#include <wlr/backend/session.h>
#include "render/allocator/drm_dumb.h"
#include "render/pixel_format.h"
diff --git a/render/allocator/gbm.c b/render/allocator/gbm.c
index 86e4749b..b546e412 100644
--- a/render/allocator/gbm.c
+++ b/render/allocator/gbm.c
@@ -4,8 +4,11 @@
#include <fcntl.h>
#include <stdlib.h>
#include <unistd.h>
+#include <wlr/render/allocator.h>
+#include <wlr/render/drm_format_set.h>
#include <wlr/util/log.h>
#include <xf86drm.h>
+
#include "render/allocator/gbm.h"
static const struct wlr_buffer_impl buffer_impl;
diff --git a/render/allocator/shm.c b/render/allocator/shm.c
index 77054dbe..044d5eb1 100644
--- a/render/allocator/shm.c
+++ b/render/allocator/shm.c
@@ -3,7 +3,10 @@
#include <stdlib.h>
#include <sys/mman.h>
#include <unistd.h>
+#include <wlr/render/allocator.h>
+#include <wlr/render/drm_format_set.h>
#include <wlr/util/log.h>
+
#include "render/pixel_format.h"
#include "render/allocator/shm.h"
#include "util/shm.h"