mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-08 05:34:22 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: unify texture format enumeration

Browse source 
Instead of having separate get_shm_texture_formats and
get_dmabuf_texture_formats functions, have a single unified
get_texture_formats function. This brings the renderer API in line
with wlr_backend_impl.
This commit is contained in:
Simon Ser 2021-08-16 15:15:12 +02:00
parent 823476e76e
commit b47535f1a2
12 changed files with 55 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

8
render/pixman/pixel_format.c
View file

@ -121,11 +121,9 @@ uint32_t get_drm_format_from_pixman(pixman_format_code_t fmt) {
return DRM_FORMAT_INVALID;
}
const uint32_t *get_pixman_drm_formats(size_t *len) {
static uint32_t drm_formats[sizeof(formats) / sizeof(formats[0])];
*len = sizeof(formats) / sizeof(formats[0]);
void init_pixman_formats(struct wlr_pixman_renderer *renderer) {
for (size_t i = 0; i < sizeof(formats) / sizeof(formats[0]); i++) {
drm_formats[i] = formats[i].drm_format;
wlr_drm_format_set_add(&renderer->drm_formats, formats[i].drm_format,
DRM_FORMAT_MOD_INVALID);
}
return drm_formats;
}

21
render/pixman/renderer.c
View file

@ -329,9 +329,14 @@ static void pixman_render_quad_with_matrix(struct wlr_renderer *wlr_renderer,
pixman_image_unref(image);
}
static const uint32_t *pixman_get_shm_texture_formats(
struct wlr_renderer *wlr_renderer, size_t *len) {
return get_pixman_drm_formats(len);
static const struct wlr_drm_format_set *pixman_get_texture_formats(
struct wlr_renderer *wlr_renderer, uint32_t buffer_caps) {
struct wlr_pixman_renderer *renderer = get_renderer(wlr_renderer);
if (buffer_caps & WLR_BUFFER_CAP_DATA_PTR) {
return &renderer->drm_formats;
} else {
return NULL;
}
}
static const struct wlr_drm_format_set *pixman_get_render_formats(
@ -501,7 +506,7 @@ static const struct wlr_renderer_impl renderer_impl = {
.scissor = pixman_scissor,
.render_subtexture_with_matrix = pixman_render_subtexture_with_matrix,
.render_quad_with_matrix = pixman_render_quad_with_matrix,
.get_shm_texture_formats = pixman_get_shm_texture_formats,
.get_texture_formats = pixman_get_texture_formats,
.get_render_formats = pixman_get_render_formats,
.texture_from_buffer = pixman_texture_from_buffer,
.bind_buffer = pixman_bind_buffer,
@ -523,13 +528,7 @@ struct wlr_renderer *wlr_pixman_renderer_create(void) {
wl_list_init(&renderer->buffers);
wl_list_init(&renderer->textures);
size_t len = 0;
const uint32_t *formats = get_pixman_drm_formats(&len);
for (size_t i = 0; i < len; ++i) {
wlr_drm_format_set_add(&renderer->drm_formats, formats[i],
DRM_FORMAT_MOD_INVALID);
}
init_pixman_formats(renderer);
return &renderer->wlr_renderer;
}