mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-27 07:58:59 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scene: don't rebuild color transforms each frame

Browse source
This commit is contained in:
Félix Poisot 2025-11-12 20:15:17 +00:00 • committed by Simon Ser
parent 3d3d5fb1b7
commit 7101a69804
2 changed files with 68 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/wlr/types/wlr_scene.h
View file

@ -258,7 +258,7 @@ struct wlr_scene_output {
struct wlr_color_transform *prev_gamma_lut_color_transform; struct wlr_color_transform *prev_gamma_lut_color_transform;
struct wlr_color_transform *prev_supplied_color_transform; struct wlr_color_transform *prev_supplied_color_transform;
struct wlr_color_transform *prev_combined_color_transform; struct wlr_color_transform *combined_color_transform;
struct wl_listener output_commit; struct wl_listener output_commit;
struct wl_listener output_damage; struct wl_listener output_damage;

122
types/scene/wlr_scene.c
View file

@ -1795,7 +1795,7 @@ void wlr_scene_output_destroy(struct wlr_scene_output *scene_output) {
wlr_color_transform_unref(scene_output->gamma_lut_color_transform); wlr_color_transform_unref(scene_output->gamma_lut_color_transform);
wlr_color_transform_unref(scene_output->prev_gamma_lut_color_transform); wlr_color_transform_unref(scene_output->prev_gamma_lut_color_transform);
wlr_color_transform_unref(scene_output->prev_supplied_color_transform); wlr_color_transform_unref(scene_output->prev_supplied_color_transform);
wlr_color_transform_unref(scene_output->prev_combined_color_transform); wlr_color_transform_unref(scene_output->combined_color_transform);
wl_array_release(&scene_output->render_list); wl_array_release(&scene_output->render_list);
free(scene_output); free(scene_output);
} }
@ -2156,39 +2156,73 @@ static void scene_output_state_attempt_gamma(struct wlr_scene_output *scene_outp
wlr_output_state_finish(&gamma_pending); wlr_output_state_finish(&gamma_pending);
} }
static struct wlr_color_transform *scene_output_combine_color_transforms( static bool scene_output_combine_color_transforms(
struct wlr_scene_output *scene_output, struct wlr_color_transform *supplied) { struct wlr_scene_output *scene_output, struct wlr_color_transform *supplied,
struct wlr_color_transform *gamma_lut = scene_output->gamma_lut_color_transform; const struct wlr_output_image_description *img_desc, bool render_gamma_lut) {
assert(gamma_lut != NULL); struct wlr_color_transform *transforms[3] = {0};
const size_t transforms_cap = sizeof(transforms) / sizeof(transforms[0]);
size_t transforms_len = 0;
if (gamma_lut == scene_output->prev_gamma_lut_color_transform && if (img_desc != NULL) {
supplied == scene_output->prev_supplied_color_transform) { assert(supplied == NULL);
return wlr_color_transform_ref(scene_output->prev_combined_color_transform); struct wlr_color_primaries primaries_srgb;
wlr_color_primaries_from_named(&primaries_srgb, WLR_COLOR_NAMED_PRIMARIES_SRGB);
struct wlr_color_primaries primaries;
wlr_color_primaries_from_named(&primaries, img_desc->primaries);
float matrix[9];
wlr_color_primaries_transform_absolute_colorimetric(&primaries_srgb, &primaries, matrix);
assert(transforms_len < transforms_cap);
transforms[transforms_len++] = wlr_color_transform_init_matrix(matrix);
assert(transforms_len < transforms_cap);
transforms[transforms_len++] = wlr_color_transform_init_linear_to_inverse_eotf(
img_desc->transfer_function);
} else if (supplied != NULL) {
assert(transforms_len < transforms_cap);
transforms[transforms_len++] = wlr_color_transform_ref(supplied);
} else {
assert(transforms_len < transforms_cap);
transforms[transforms_len++] = wlr_color_transform_init_linear_to_inverse_eotf(
WLR_COLOR_TRANSFER_FUNCTION_GAMMA22);
} }
struct wlr_color_transform *combined; struct wlr_color_transform *gamma_lut = scene_output->gamma_lut_color_transform;
if (supplied == NULL) { if (gamma_lut != NULL && render_gamma_lut) {
combined = wlr_color_transform_ref(gamma_lut); assert(transforms_len < transforms_cap);
} else { transforms[transforms_len++] = wlr_color_transform_ref(gamma_lut);
struct wlr_color_transform *transforms[] = { }
supplied,
gamma_lut, for (size_t i = 0; i < transforms_len; ++i) {
}; if (transforms[i] == NULL) {
size_t transforms_len = sizeof(transforms) / sizeof(transforms[0]); goto err_transforms;
combined = wlr_color_transform_init_pipeline(transforms, transforms_len);
if (combined == NULL) {
return NULL;
} }
} }
struct wlr_color_transform *combined;
if (transforms_len == 1) {
combined = wlr_color_transform_ref(transforms[0]);
} else {
combined = wlr_color_transform_init_pipeline(transforms, transforms_len);
}
if (combined == NULL) {
goto err_transforms;
}
for (size_t i = 0; i < transforms_len; ++i) {
wlr_color_transform_unref(transforms[i]);
}
wlr_color_transform_unref(scene_output->prev_gamma_lut_color_transform); wlr_color_transform_unref(scene_output->prev_gamma_lut_color_transform);
scene_output->prev_gamma_lut_color_transform = wlr_color_transform_ref(gamma_lut); scene_output->prev_gamma_lut_color_transform = gamma_lut ? wlr_color_transform_ref(gamma_lut) : NULL;
wlr_color_transform_unref(scene_output->prev_supplied_color_transform); wlr_color_transform_unref(scene_output->prev_supplied_color_transform);
scene_output->prev_supplied_color_transform = supplied ? wlr_color_transform_ref(supplied) : NULL; scene_output->prev_supplied_color_transform = supplied ? wlr_color_transform_ref(supplied) : NULL;
wlr_color_transform_unref(scene_output->prev_combined_color_transform); wlr_color_transform_unref(scene_output->combined_color_transform);
scene_output->prev_combined_color_transform = wlr_color_transform_ref(combined); scene_output->combined_color_transform = combined;
return combined; return true;
err_transforms:
for (size_t i = 0; i < transforms_len; ++i) {
wlr_color_transform_unref(transforms[i]);
}
return false;
} }
bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output, bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
@ -2384,49 +2418,27 @@ bool wlr_scene_output_build_state(struct wlr_scene_output *scene_output,
timer->pre_render_duration = timespec_to_nsec(&duration); timer->pre_render_duration = timespec_to_nsec(&duration);
} }
struct wlr_color_transform *color_transform = NULL; if ((render_gamma_lut
const struct wlr_output_image_description *img_desc = output_pending_image_description(output, state); && scene_output->gamma_lut_color_transform != scene_output->prev_gamma_lut_color_transform)
if (img_desc != NULL) { || scene_output->prev_supplied_color_transform != options->color_transform
struct wlr_color_primaries primaries_srgb; || (state->committed & WLR_OUTPUT_STATE_IMAGE_DESCRIPTION)) {
wlr_color_primaries_from_named(&primaries_srgb, WLR_COLOR_NAMED_PRIMARIES_SRGB); const struct wlr_output_image_description *output_description =
struct wlr_color_primaries primaries; output_pending_image_description(output, state);
wlr_color_primaries_from_named(&primaries, img_desc->primaries); if (!scene_output_combine_color_transforms(scene_output, options->color_transform,
float matrix[9]; output_description, render_gamma_lut)) {
wlr_color_primaries_transform_absolute_colorimetric(&primaries_srgb, &primaries, matrix);
struct wlr_color_transform *transforms[] = {
wlr_color_transform_init_matrix(matrix),
wlr_color_transform_init_linear_to_inverse_eotf(img_desc->transfer_function),
};
size_t transform_count = sizeof(transforms) / sizeof(transforms[0]);
color_transform = wlr_color_transform_init_pipeline(transforms, transform_count);
wlr_color_transform_unref(transforms[0]);
wlr_color_transform_unref(transforms[1]);
}
if (options->color_transform != NULL) {
assert(color_transform == NULL);
color_transform = wlr_color_transform_ref(options->color_transform);
}
if (render_gamma_lut) {
struct wlr_color_transform *combined =
scene_output_combine_color_transforms(scene_output, color_transform);
wlr_color_transform_unref(color_transform);
if (combined == NULL) {
wlr_buffer_unlock(buffer); wlr_buffer_unlock(buffer);
return false; return false;
} }
color_transform = combined;
} }
scene_output->in_point++; scene_output->in_point++;
struct wlr_render_pass *render_pass = wlr_renderer_begin_buffer_pass(output->renderer, buffer, struct wlr_render_pass *render_pass = wlr_renderer_begin_buffer_pass(output->renderer, buffer,
&(struct wlr_buffer_pass_options){ &(struct wlr_buffer_pass_options){
.timer = timer ? timer->render_timer : NULL, .timer = timer ? timer->render_timer : NULL,
.color_transform = color_transform, .color_transform = scene_output->combined_color_transform,
.signal_timeline = scene_output->in_timeline, .signal_timeline = scene_output->in_timeline,
.signal_point = scene_output->in_point, .signal_point = scene_output->in_point,
}); });
wlr_color_transform_unref(color_transform);
if (render_pass == NULL) { if (render_pass == NULL) {
wlr_buffer_unlock(buffer); wlr_buffer_unlock(buffer);
return false; return false;