buffer: make enum wlr_buffer_cap public

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.

(cherry picked from commit a38baec1f8)
This commit is contained in:
Simon Ser 2021-07-01 22:12:32 +02:00
parent 4b2ef3dff9
commit dc2e640a7d
14 changed files with 12 additions and 24 deletions

View File

@ -13,7 +13,6 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xf86drm.h> #include <xf86drm.h>
#include "backend/drm/drm.h" #include "backend/drm/drm.h"
#include "types/wlr_buffer.h"
#include "util/signal.h" #include "util/signal.h"
struct wlr_drm_backend *get_drm_backend_from_backend( struct wlr_drm_backend *get_drm_backend_from_backend(

View File

@ -28,7 +28,6 @@
#include "render/drm_format_set.h" #include "render/drm_format_set.h"
#include "render/swapchain.h" #include "render/swapchain.h"
#include "render/wlr_renderer.h" #include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h" #include "util/signal.h"
static const uint32_t SUPPORTED_OUTPUT_STATE = static const uint32_t SUPPORTED_OUTPUT_STATE =

View File

@ -14,7 +14,6 @@
#include "render/drm_format_set.h" #include "render/drm_format_set.h"
#include "render/gbm_allocator.h" #include "render/gbm_allocator.h"
#include "render/wlr_renderer.h" #include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h" #include "util/signal.h"
struct wlr_headless_backend *headless_backend_from_backend( struct wlr_headless_backend *headless_backend_from_backend(

View File

@ -21,7 +21,6 @@
#include "render/drm_format_set.h" #include "render/drm_format_set.h"
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "render/wlr_renderer.h" #include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h" #include "util/signal.h"
#include "drm-client-protocol.h" #include "drm-client-protocol.h"

View File

@ -19,7 +19,6 @@
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "render/swapchain.h" #include "render/swapchain.h"
#include "render/wlr_renderer.h" #include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
#include "util/signal.h" #include "util/signal.h"
#include "linux-dmabuf-unstable-v1-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h"

View File

@ -33,7 +33,6 @@
#include "backend/x11.h" #include "backend/x11.h"
#include "render/allocator.h" #include "render/allocator.h"
#include "render/drm_format_set.h" #include "render/drm_format_set.h"
#include "types/wlr_buffer.h"
#include "util/signal.h" #include "util/signal.h"
// See dri2_format_for_depth in mesa // See dri2_format_for_depth in mesa

View File

@ -21,7 +21,6 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "backend/x11.h" #include "backend/x11.h"
#include "types/wlr_buffer.h"
#include "util/signal.h" #include "util/signal.h"
#include "util/time.h" #include "util/time.h"

View File

@ -25,18 +25,6 @@ struct wlr_shm_client_buffer {
struct wlr_shm_client_buffer *shm_client_buffer_create( struct wlr_shm_client_buffer *shm_client_buffer_create(
struct wl_resource *resource); struct wl_resource *resource);
/**
* 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 * 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 * storage. The format and stride can be used to interpret the memory region

View File

@ -33,6 +33,18 @@ struct wlr_buffer_impl {
void (*end_data_ptr_access)(struct wlr_buffer *buffer); 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. * A buffer containing pixel data.
* *

View File

@ -8,7 +8,6 @@
#include "render/shm_allocator.h" #include "render/shm_allocator.h"
#include "render/drm_dumb_allocator.h" #include "render/drm_dumb_allocator.h"
#include "render/wlr_renderer.h" #include "render/wlr_renderer.h"
#include "types/wlr_buffer.h"
void wlr_allocator_init(struct wlr_allocator *alloc, void wlr_allocator_init(struct wlr_allocator *alloc,
const struct wlr_allocator_interface *impl, uint32_t buffer_caps) { const struct wlr_allocator_interface *impl, uint32_t buffer_caps) {

View File

@ -15,7 +15,6 @@
#include "render/drm_dumb_allocator.h" #include "render/drm_dumb_allocator.h"
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "types/wlr_buffer.h"
static const struct wlr_buffer_impl buffer_impl; static const struct wlr_buffer_impl buffer_impl;

View File

@ -7,7 +7,6 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include <xf86drm.h> #include <xf86drm.h>
#include "render/gbm_allocator.h" #include "render/gbm_allocator.h"
#include "types/wlr_buffer.h"
static const struct wlr_buffer_impl buffer_impl; static const struct wlr_buffer_impl buffer_impl;

View File

@ -17,7 +17,6 @@
#include <wlr/util/log.h> #include <wlr/util/log.h>
#include "render/gles2.h" #include "render/gles2.h"
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "types/wlr_buffer.h"
static const GLfloat verts[] = { static const GLfloat verts[] = {
1, 0, // top right 1, 0, // top right

View File

@ -7,7 +7,6 @@
#include "render/pixel_format.h" #include "render/pixel_format.h"
#include "render/shm_allocator.h" #include "render/shm_allocator.h"
#include "util/shm.h" #include "util/shm.h"
#include "types/wlr_buffer.h"
static const struct wlr_buffer_impl buffer_impl; static const struct wlr_buffer_impl buffer_impl;