aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
Diffstat (limited to 'render')
-rw-r--r--render/gles2/texture.c4
-rw-r--r--render/pixman/renderer.c16
2 files changed, 10 insertions, 10 deletions
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index 64ac05ac..293b7a19 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -346,11 +346,11 @@ struct wlr_texture *gles2_texture_from_buffer(struct wlr_renderer *wlr_renderer,
struct wlr_dmabuf_attributes dmabuf;
if (wlr_buffer_get_dmabuf(buffer, &dmabuf)) {
return gles2_texture_from_dmabuf_buffer(renderer, buffer, &dmabuf);
- } else if (buffer_begin_data_ptr_access(buffer,
+ } else if (wlr_buffer_begin_data_ptr_access(buffer,
WLR_BUFFER_DATA_PTR_ACCESS_READ, &data, &format, &stride)) {
struct wlr_texture *tex = gles2_texture_from_pixels(wlr_renderer,
format, stride, buffer->width, buffer->height, data);
- buffer_end_data_ptr_access(buffer);
+ wlr_buffer_end_data_ptr_access(buffer);
return tex;
} else {
return NULL;
diff --git a/render/pixman/renderer.c b/render/pixman/renderer.c
index 4eb1bd3f..2ae05d00 100644
--- a/render/pixman/renderer.c
+++ b/render/pixman/renderer.c
@@ -96,13 +96,13 @@ static struct wlr_pixman_buffer *create_buffer(
void *data = NULL;
uint32_t drm_format;
size_t stride;
- if (!buffer_begin_data_ptr_access(wlr_buffer,
+ if (!wlr_buffer_begin_data_ptr_access(wlr_buffer,
WLR_BUFFER_DATA_PTR_ACCESS_READ | WLR_BUFFER_DATA_PTR_ACCESS_WRITE,
&data, &drm_format, &stride)) {
wlr_log(WLR_ERROR, "Failed to get buffer data");
goto error_buffer;
}
- buffer_end_data_ptr_access(wlr_buffer);
+ wlr_buffer_end_data_ptr_access(wlr_buffer);
pixman_format_code_t format = get_pixman_format_from_drm(drm_format);
if (format == 0) {
@@ -145,7 +145,7 @@ static void pixman_begin(struct wlr_renderer *wlr_renderer, uint32_t width,
void *data = NULL;
uint32_t drm_format;
size_t stride;
- buffer_begin_data_ptr_access(buffer->buffer,
+ wlr_buffer_begin_data_ptr_access(buffer->buffer,
WLR_BUFFER_DATA_PTR_ACCESS_READ | WLR_BUFFER_DATA_PTR_ACCESS_WRITE,
&data, &drm_format, &stride);
@@ -166,7 +166,7 @@ static void pixman_end(struct wlr_renderer *wlr_renderer) {
assert(renderer->current_buffer != NULL);
- buffer_end_data_ptr_access(renderer->current_buffer->buffer);
+ wlr_buffer_end_data_ptr_access(renderer->current_buffer->buffer);
}
static void pixman_clear(struct wlr_renderer *wlr_renderer,
@@ -233,7 +233,7 @@ static bool pixman_render_subtexture_with_matrix(
void *data;
uint32_t drm_format;
size_t stride;
- if (!buffer_begin_data_ptr_access(texture->buffer,
+ if (!wlr_buffer_begin_data_ptr_access(texture->buffer,
WLR_BUFFER_DATA_PTR_ACCESS_READ, &data, &drm_format, &stride)) {
return false;
}
@@ -272,7 +272,7 @@ static bool pixman_render_subtexture_with_matrix(
renderer->height);
if (texture->buffer != NULL) {
- buffer_end_data_ptr_access(texture->buffer);
+ wlr_buffer_end_data_ptr_access(texture->buffer);
}
pixman_image_unref(mask);
@@ -380,11 +380,11 @@ static struct wlr_texture *pixman_texture_from_buffer(
void *data = NULL;
uint32_t drm_format;
size_t stride;
- if (!buffer_begin_data_ptr_access(buffer, WLR_BUFFER_DATA_PTR_ACCESS_READ,
+ if (!wlr_buffer_begin_data_ptr_access(buffer, WLR_BUFFER_DATA_PTR_ACCESS_READ,
&data, &drm_format, &stride)) {
return NULL;
}
- buffer_end_data_ptr_access(buffer);
+ wlr_buffer_end_data_ptr_access(buffer);
struct wlr_pixman_texture *texture = pixman_texture_create(renderer,
drm_format, buffer->width, buffer->height);