diff options
| -rw-r--r-- | backend/drm/renderer.c | 2 | ||||
| -rw-r--r-- | backend/headless/backend.c | 2 | ||||
| -rw-r--r-- | backend/wayland/backend.c | 2 | ||||
| -rw-r--r-- | backend/x11/backend.c | 2 | ||||
| -rw-r--r-- | include/render/wlr_renderer.h | 6 | ||||
| -rw-r--r-- | include/wlr/render/interface.h | 2 | ||||
| -rw-r--r-- | render/gles2/renderer.c | 4 | ||||
| -rw-r--r-- | render/wlr_renderer.c | 6 |
8 files changed, 13 insertions, 13 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index 208b8621..e1a0e427 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -225,7 +225,7 @@ bool drm_plane_init_surface(struct wlr_drm_plane *plane, } const struct wlr_drm_format_set *render_formats = - wlr_renderer_get_dmabuf_render_formats(drm->renderer.wlr_rend); + wlr_renderer_get_render_formats(drm->renderer.wlr_rend); if (render_formats == NULL) { wlr_log(WLR_ERROR, "Failed to get render formats"); return false; diff --git a/backend/headless/backend.c b/backend/headless/backend.c index ba5fde80..f0b9e0ce 100644 --- a/backend/headless/backend.c +++ b/backend/headless/backend.c @@ -131,7 +131,7 @@ static bool backend_init(struct wlr_headless_backend *backend, backend->renderer = renderer; const struct wlr_drm_format_set *formats = - wlr_renderer_get_dmabuf_render_formats(backend->renderer); + wlr_renderer_get_render_formats(backend->renderer); if (formats == NULL) { wlr_log(WLR_ERROR, "Failed to get available DMA-BUF formats from renderer"); return false; diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index 825a5ad7..9b587618 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -459,7 +459,7 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, } const struct wlr_drm_format_set *render_formats = - wlr_renderer_get_dmabuf_render_formats(wl->renderer); + wlr_renderer_get_render_formats(wl->renderer); if (render_formats == NULL) { wlr_log(WLR_ERROR, "Failed to get available DMA-BUF formats from renderer"); goto error_renderer; diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 4d825631..dc7c3689 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -593,7 +593,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, } const struct wlr_drm_format_set *render_formats = - wlr_renderer_get_dmabuf_render_formats(x11->renderer); + wlr_renderer_get_render_formats(x11->renderer); if (render_formats == NULL) { wlr_log(WLR_ERROR, "Failed to get available DMA-BUF formats from renderer"); return false; diff --git a/include/render/wlr_renderer.h b/include/render/wlr_renderer.h index dab9fd12..8298bab7 100644 --- a/include/render/wlr_renderer.h +++ b/include/render/wlr_renderer.h @@ -16,10 +16,10 @@ struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd); */ bool wlr_renderer_bind_buffer(struct wlr_renderer *r, struct wlr_buffer *buffer); /** - * Get the DMA-BUF formats supporting rendering usage. Buffers allocated with - * a format from this list may be attached via wlr_renderer_bind_buffer. + * Get the supported render formats. Buffers allocated with a format from this + * list may be attached via wlr_renderer_bind_buffer. */ -const struct wlr_drm_format_set *wlr_renderer_get_dmabuf_render_formats( +const struct wlr_drm_format_set *wlr_renderer_get_render_formats( struct wlr_renderer *renderer); #endif diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 5159e83b..f11e0118 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -38,7 +38,7 @@ struct wlr_renderer_impl { struct wl_resource *buffer, int *width, int *height); const struct wlr_drm_format_set *(*get_dmabuf_texture_formats)( struct wlr_renderer *renderer); - const struct wlr_drm_format_set *(*get_dmabuf_render_formats)( + const struct wlr_drm_format_set *(*get_render_formats)( struct wlr_renderer *renderer); uint32_t (*preferred_read_format)(struct wlr_renderer *renderer); bool (*read_pixels)(struct wlr_renderer *renderer, uint32_t fmt, diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index ed7ed8c4..5f1dfa4a 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -395,7 +395,7 @@ static const struct wlr_drm_format_set *gles2_get_dmabuf_texture_formats( return wlr_egl_get_dmabuf_texture_formats(renderer->egl); } -static const struct wlr_drm_format_set *gles2_get_dmabuf_render_formats( +static const struct wlr_drm_format_set *gles2_get_render_formats( struct wlr_renderer *wlr_renderer) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); return wlr_egl_get_dmabuf_render_formats(renderer->egl); @@ -576,7 +576,7 @@ static const struct wlr_renderer_impl renderer_impl = { .resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer, .wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size, .get_dmabuf_texture_formats = gles2_get_dmabuf_texture_formats, - .get_dmabuf_render_formats = gles2_get_dmabuf_render_formats, + .get_render_formats = gles2_get_render_formats, .preferred_read_format = gles2_preferred_read_format, .read_pixels = gles2_read_pixels, .texture_from_pixels = gles2_texture_from_pixels, diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index 7b1bc89a..ac7629e4 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -160,12 +160,12 @@ const struct wlr_drm_format_set *wlr_renderer_get_dmabuf_texture_formats( return r->impl->get_dmabuf_texture_formats(r); } -const struct wlr_drm_format_set *wlr_renderer_get_dmabuf_render_formats( +const struct wlr_drm_format_set *wlr_renderer_get_render_formats( struct wlr_renderer *r) { - if (!r->impl->get_dmabuf_render_formats) { + if (!r->impl->get_render_formats) { return NULL; } - return r->impl->get_dmabuf_render_formats(r); + return r->impl->get_render_formats(r); } bool wlr_renderer_read_pixels(struct wlr_renderer *r, uint32_t fmt, |