Skip to content
This repository has been archived by the owner on Nov 1, 2021. It is now read-only.

Commit

Permalink
buffer: make enum wlr_buffer_cap public
Browse files Browse the repository at this point in the history
Custom backends and renderers need to implement
wlr_backend_impl.get_buffer_caps and
wlr_renderer_impl.get_render_buffer_caps. They can't if enum
wlr_buffer_cap isn't made public.
  • Loading branch information
emersion authored and bl4ckb0ne committed Jul 1, 2021
1 parent 29be2d4 commit a38baec
Show file tree
Hide file tree
Showing 14 changed files with 12 additions and 24 deletions.
1 change: 0 additions & 1 deletion backend/drm/backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <wlr/util/log.h>
#include <xf86drm.h>
#include "backend/drm/drm.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"

struct wlr_drm_backend *get_drm_backend_from_backend(
Expand Down
1 change: 0 additions & 1 deletion backend/drm/drm.c
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@
#include "render/drm_format_set.h"
#include "render/swapchain.h"
#include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"

static const uint32_t SUPPORTED_OUTPUT_STATE =
Expand Down
1 change: 0 additions & 1 deletion backend/headless/backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
#include "render/drm_format_set.h"
#include "render/gbm_allocator.h"
#include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"

struct wlr_headless_backend *headless_backend_from_backend(
Expand Down
1 change: 0 additions & 1 deletion backend/wayland/backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include "render/drm_format_set.h"
#include "render/pixel_format.h"
#include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"

#include "drm-client-protocol.h"
Expand Down
1 change: 0 additions & 1 deletion backend/wayland/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
#include "render/pixel_format.h"
#include "render/swapchain.h"
#include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"

#include "linux-dmabuf-unstable-v1-client-protocol.h"
Expand Down
1 change: 0 additions & 1 deletion backend/x11/backend.c
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
#include "backend/x11.h"
#include "render/allocator.h"
#include "render/drm_format_set.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"

// See dri2_format_for_depth in mesa
Expand Down
1 change: 0 additions & 1 deletion backend/x11/output.c
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
#include <wlr/util/log.h>

#include "backend/x11.h"
#include "types/wlr_buffer.h"
#include "util/signal.h"
#include "util/time.h"

Expand Down
12 changes: 0 additions & 12 deletions include/types/wlr_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,6 @@ struct wlr_dmabuf_buffer *dmabuf_buffer_create(
*/
bool dmabuf_buffer_drop(struct wlr_dmabuf_buffer *buffer);

/**
* Buffer capabilities.
*
* These bits indicate the features supported by a wlr_buffer. There is one bit
* per function in wlr_buffer_impl.
*/
enum wlr_buffer_cap {
WLR_BUFFER_CAP_DATA_PTR = 1 << 0,
WLR_BUFFER_CAP_DMABUF = 1 << 1,
WLR_BUFFER_CAP_SHM = 1 << 2,
};

/**
* Get a pointer to a region of memory referring to the buffer's underlying
* storage. The format and stride can be used to interpret the memory region
Expand Down
12 changes: 12 additions & 0 deletions include/wlr/types/wlr_buffer.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,18 @@ struct wlr_buffer_impl {
void (*end_data_ptr_access)(struct wlr_buffer *buffer);
};

/**
* Buffer capabilities.
*
* These bits indicate the features supported by a wlr_buffer. There is one bit
* per function in wlr_buffer_impl.
*/
enum wlr_buffer_cap {
WLR_BUFFER_CAP_DATA_PTR = 1 << 0,
WLR_BUFFER_CAP_DMABUF = 1 << 1,
WLR_BUFFER_CAP_SHM = 1 << 2,
};

/**
* A buffer containing pixel data.
*
Expand Down
1 change: 0 additions & 1 deletion render/allocator.c
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include "render/shm_allocator.h"
#include "render/drm_dumb_allocator.h"
#include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"

void wlr_allocator_init(struct wlr_allocator *alloc,
const struct wlr_allocator_interface *impl, uint32_t buffer_caps) {
Expand Down
1 change: 0 additions & 1 deletion render/drm_dumb_allocator.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include "render/drm_dumb_allocator.h"
#include "render/pixel_format.h"
#include "types/wlr_buffer.h"

static const struct wlr_buffer_impl buffer_impl;

Expand Down
1 change: 0 additions & 1 deletion render/gbm_allocator.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <wlr/util/log.h>
#include <xf86drm.h>
#include "render/gbm_allocator.h"
#include "types/wlr_buffer.h"

static const struct wlr_buffer_impl buffer_impl;

Expand Down
1 change: 0 additions & 1 deletion render/gles2/renderer.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include "render/egl.h"
#include "render/gles2.h"
#include "render/pixel_format.h"
#include "types/wlr_buffer.h"

static const GLfloat verts[] = {
1, 0, // top right
Expand Down
1 change: 0 additions & 1 deletion render/shm_allocator.c
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include "render/pixel_format.h"
#include "render/shm_allocator.h"
#include "util/shm.h"
#include "types/wlr_buffer.h"

static const struct wlr_buffer_impl buffer_impl;

Expand Down

0 comments on commit a38baec

Please sign in to comment.