fdo-mirrors/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston.git synced 2025-12-29 11:30:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend-drm: fix vulkan output init format

Browse source 
The default output format setting to the backend format was removed and
renderer-specific format picking functions were introduced, but one was
not included for vulkan-renderer.
Vulkan-renderer doesn't yet implement color management features which
would benefit from a full featured format selection here, so for now
just have a base implementation which restores the previous behavior.
This fixes the introduced segfault with vulkan-renderer and drm-backend.

Fixes: 56c27ea2 ("backend-drm: improve code that chooses output->format")

Signed-off-by: Erico Nunes <nunes.erico@gmail.com>
This commit is contained in:
Erico Nunes 2025-09-11 10:54:28 +02:00 • committed by Marius Vlad
parent 39108501b3
commit 6f1d9cdffd
1 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
libweston/backend-drm/drm-gbm.c
View file

@ -671,12 +671,45 @@ create_renderbuffers(struct gbm_device *gbm, struct drm_output *output, unsigned
} }
} }
static bool
drm_output_pick_format_vulkan(struct drm_output *output)
{
struct drm_device *device = output->device;
struct drm_backend *b = device->backend;
/* Any other value of eotf_mode requires color-management, which is not
* yet supported by vulkan-renderer. */
assert(output->base.eotf_mode == WESTON_EOTF_MODE_SDR);
if (!b->format->vulkan_format) {
weston_log("Error: failed to pick format for output '%s', format %s unsupported by vulkan-renderer.\n",
output->base.name, b->format->drm_format_name);
return false;
}
assert(b->format);
output->format = b->format;
if (b->has_underlay && (output->format->bits.a == 0)) {
weston_log("Disabling underlay planes: output '%s' with format %s does not have alpha channel,\n"
"which is required to support underlay planes.\n",
output->base.name, output->format->drm_format_name);
b->has_underlay = false;
}
return true;
}
/* Init output state that depends on vulkan */ /* Init output state that depends on vulkan */
int int
drm_output_init_vulkan(struct drm_output *output, struct drm_backend *b) drm_output_init_vulkan(struct drm_output *output, struct drm_backend *b)
{ {
const struct weston_mode *mode = output->base.current_mode; const struct weston_mode *mode = output->base.current_mode;
struct weston_renderer *renderer = b->compositor->renderer; struct weston_renderer *renderer = b->compositor->renderer;
if (!output->format && !drm_output_pick_format_vulkan(output))
return -1;
const struct vulkan_renderer_surfaceless_options options = { const struct vulkan_renderer_surfaceless_options options = {
.area.x = 0, .area.x = 0,
.area.y = 0, .area.y = 0,