mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-14 06:59:43 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

buffer: add data_ptr access flags

Browse source 
This allows callers to specify the operations they'll perform on
the returned data pointer. The motivations for this are:

- The upcoming Linux MAP_NOSIGBUS flag may only be usable on
  read-only mappings.
- gbm_bo_map with GBM_BO_TRANSFER_READ hurts performance.
This commit is contained in:
Simon Ser 2021-06-29 17:08:32 +02:00 • committed by Simon Zeni
parent 105fdecd0c
commit 4e7a8707cc
7 changed files with 46 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
types/wlr_buffer.c
View file

@ -75,13 +75,13 @@ bool wlr_buffer_get_dmabuf(struct wlr_buffer *buffer,
return buffer->impl->get_dmabuf(buffer, attribs);
}
bool buffer_begin_data_ptr_access(struct wlr_buffer *buffer, void **data,
uint32_t *format, size_t *stride) {
bool buffer_begin_data_ptr_access(struct wlr_buffer *buffer, uint32_t flags,
void **data, uint32_t *format, size_t *stride) {
assert(!buffer->accessing_data_ptr);
if (!buffer->impl->begin_data_ptr_access) {
return false;
}
if (!buffer->impl->begin_data_ptr_access(buffer, data, format, stride)) {
if (!buffer->impl->begin_data_ptr_access(buffer, flags, data, format, stride)) {
return false;
}
buffer->accessing_data_ptr = true;
@ -292,7 +292,8 @@ bool wlr_client_buffer_apply_damage(struct wlr_client_buffer *client_buffer,
void *data;
uint32_t format;
size_t stride;
if (!buffer_begin_data_ptr_access(next, &data, &format, &stride)) {
if (!buffer_begin_data_ptr_access(next, WLR_BUFFER_DATA_PTR_ACCESS_READ,
&data, &format, &stride)) {
return false;
}
@ -343,7 +344,7 @@ static void shm_client_buffer_destroy(struct wlr_buffer *wlr_buffer) {
}
static bool shm_client_buffer_begin_data_ptr_access(struct wlr_buffer *wlr_buffer,
void **data, uint32_t *format, size_t *stride) {
uint32_t flags, void **data, uint32_t *format, size_t *stride) {
struct wlr_shm_client_buffer *buffer =
shm_client_buffer_from_buffer(wlr_buffer);
*format = buffer->format;
@ -454,13 +455,16 @@ static void readonly_data_buffer_destroy(struct wlr_buffer *wlr_buffer) {
}
static bool readonly_data_buffer_begin_data_ptr_access(struct wlr_buffer *wlr_buffer,
void **data, uint32_t *format, size_t *stride) {
uint32_t flags, void **data, uint32_t *format, size_t *stride) {
struct wlr_readonly_data_buffer *buffer =
readonly_data_buffer_from_buffer(wlr_buffer);
if (buffer->data == NULL) {
return false;
}
*data = (void*)buffer->data;
if (flags & WLR_BUFFER_DATA_PTR_ACCESS_WRITE) {
return false;
}
*data = (void *)buffer->data;
*format = buffer->format;
*stride = buffer->stride;
return true;