mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-02-23 01:40:31 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render: don't infer luminance multipliers from color TF

Browse source 
Make scene pass them explicitly instead. Ref #3995
This commit is contained in:
Félix Poisot 2026-01-11 13:59:43 +00:00
parent 68052f34d3
commit 5a40da7e15
6 changed files with 36 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

9
types/output/cursor.c
View file

@ -512,6 +512,15 @@ bool output_cursor_refresh_color_transform(struct wlr_output_cursor *output_curs
wlr_color_primaries_from_named(&primaries, img_desc->primaries);
float matrix[9];
wlr_color_primaries_transform_absolute_colorimetric(&primaries_srgb, &primaries, matrix);
// Source is sRGB, which has reference == max
struct wlr_color_luminances dst_lum;
wlr_color_transfer_function_get_default_luminance(img_desc->transfer_function, &dst_lum);
float luminance_multiplier = dst_lum.reference / dst_lum.max;
for (int i = 0; i < 9; ++i) {
matrix[i] *= luminance_multiplier;
}
struct wlr_color_transform *transforms[] = {
wlr_color_transform_init_matrix(matrix),
wlr_color_transform_init_linear_to_inverse_eotf(img_desc->transfer_function),

23
types/scene/wlr_scene.c
View file

@ -1435,6 +1435,11 @@ struct render_list_entry {
int x, y;
};
static float get_luminance_multiplier(const struct wlr_color_luminances *src_lum,
const struct wlr_color_luminances *dst_lum) {
return (dst_lum->reference / src_lum->reference) * (src_lum->max / dst_lum->max);
}
static void scene_entry_render(struct render_list_entry *entry, const struct render_data *data) {
struct wlr_scene_node *node = entry->node;
@ -1518,6 +1523,13 @@ static void scene_entry_render(struct render_list_entry *entry, const struct ren
wlr_color_primaries_from_named(&primaries, scene_buffer->primaries);
}
struct wlr_color_luminances src_lum, srgb_lum;
wlr_color_transfer_function_get_default_luminance(
scene_buffer->transfer_function, &src_lum);
wlr_color_transfer_function_get_default_luminance(
WLR_COLOR_TRANSFER_FUNCTION_SRGB, &srgb_lum);
float luminance_multiplier = get_luminance_multiplier(&src_lum, &srgb_lum);
wlr_render_pass_add_texture(data->render_pass, &(struct wlr_render_texture_options) {
.texture = texture,
.src_box = scene_buffer->src_box,
@ -1533,6 +1545,7 @@ static void scene_entry_render(struct render_list_entry *entry, const struct ren
.primaries = scene_buffer->primaries != 0 ? &primaries : NULL,
.color_encoding = scene_buffer->color_encoding,
.color_range = scene_buffer->color_range,
.luminance_multiplier = &luminance_multiplier,
.wait_timeline = scene_buffer->wait_timeline,
.wait_point = scene_buffer->wait_point,
});
@ -2208,6 +2221,16 @@ static bool scene_output_combine_color_transforms(
wlr_color_primaries_from_named(&primaries, img_desc->primaries);
float matrix[9];
wlr_color_primaries_transform_absolute_colorimetric(&primaries_srgb, &primaries, matrix);
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(img_desc->transfer_function, &dst_lum);
float luminance_multiplier = get_luminance_multiplier(&srgb_lum, &dst_lum);
for (int i = 0; i < 9; ++i) {
matrix[i] *= luminance_multiplier;
}
color_matrix = wlr_color_transform_init_matrix(matrix);
inv_eotf = wlr_color_transform_init_linear_to_inverse_eotf(img_desc->transfer_function);
if (color_matrix == NULL || inv_eotf == NULL) {