Merge branch 'edid-color-metadata' into 'master'

Draft: output, backend/drm: add wlr_output.color_primaries

See merge request wlroots/wlroots!5096
This commit is contained in:
Simon Ser 2025-10-29 11:55:09 +00:00
commit 58a9c3b1c2
7 changed files with 60 additions and 3 deletions

View file

@ -254,7 +254,11 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
struct wlr_color_luminances srgb_lum, dst_lum;
wlr_color_transfer_function_get_default_luminance(
WLR_COLOR_TRANSFER_FUNCTION_SRGB, &srgb_lum);
wlr_color_transfer_function_get_default_luminance(tf, &dst_lum);
if (pass->has_luminances) {
dst_lum = pass->luminances;
} else {
wlr_color_transfer_function_get_default_luminance(tf, &dst_lum);
}
frag_pcr_data.luminance_multiplier = get_luminance_multiplier(&srgb_lum, &dst_lum);
}
bind_pipeline(pass, pipeline);
@ -1243,6 +1247,10 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
pass->has_primaries = true;
pass->primaries = *options->primaries;
}
if (options != NULL && options->luminances != NULL) {
pass->has_luminances = true;
pass->luminances = *options->luminances;
}
rect_union_init(&pass->updated_region);