mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-02 09:01:38 -05: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

32
render/wlr_renderer.c
View file

@ -37,7 +37,7 @@ void wlr_renderer_init(struct wlr_renderer *renderer,
assert(impl->scissor);
assert(impl->render_subtexture_with_matrix);
assert(impl->render_quad_with_matrix);
assert(impl->get_shm_texture_formats);
assert(impl->get_texture_formats);
assert(impl->get_render_buffer_caps);
renderer->impl = impl;
@ -166,17 +166,9 @@ void wlr_render_quad_with_matrix(struct wlr_renderer *r,
r->impl->render_quad_with_matrix(r, color, matrix);
}
const uint32_t *wlr_renderer_get_shm_texture_formats(struct wlr_renderer *r,
size_t *len) {
return r->impl->get_shm_texture_formats(r, len);
}
const struct wlr_drm_format_set *wlr_renderer_get_dmabuf_texture_formats(
struct wlr_renderer *r) {
if (!r->impl->get_dmabuf_texture_formats) {
return NULL;
}
return r->impl->get_dmabuf_texture_formats(r);
const struct wlr_drm_format_set *wlr_renderer_get_texture_formats(
struct wlr_renderer *r, uint32_t buffer_caps) {
return r->impl->get_texture_formats(r, buffer_caps);
}
const struct wlr_drm_format_set *wlr_renderer_get_render_formats(
@ -209,19 +201,19 @@ bool wlr_renderer_init_wl_shm(struct wlr_renderer *r,
return false;
}
size_t len;
const uint32_t *formats = wlr_renderer_get_shm_texture_formats(r, &len);
if (formats == NULL) {
wlr_log(WLR_ERROR, "Failed to initialize wl_shm: "
"cannot get renderer formats");
const struct wlr_drm_format_set *shm_formats =
wlr_renderer_get_texture_formats(r, WLR_BUFFER_CAP_DATA_PTR);
if (shm_formats == NULL) {
wlr_log(WLR_ERROR, "Failed to initialize shm: cannot get formats");
return false;
}
bool argb8888 = false, xrgb8888 = false;
for (size_t i = 0; i < len; ++i) {
for (size_t i = 0; i < shm_formats->len; ++i) {
// ARGB8888 and XRGB8888 must be supported and are implicitly
// advertised by wl_display_init_shm
enum wl_shm_format fmt = convert_drm_format_to_wl_shm(formats[i]);
enum wl_shm_format fmt =
convert_drm_format_to_wl_shm(shm_formats->formats[i]->format);
switch (fmt) {
case WL_SHM_FORMAT_ARGB8888:
argb8888 = true;
@ -248,7 +240,7 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r,
return false;
}
if (wlr_renderer_get_dmabuf_texture_formats(r) != NULL) {
if (wlr_renderer_get_texture_formats(r, WLR_BUFFER_CAP_DMABUF) != NULL) {
if (wlr_renderer_get_drm_fd(r) >= 0) {
if (wlr_drm_create(wl_display, r) == NULL) {
return false;