mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-20 05:35:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

scene: add support for color encoding and range

Browse source
This commit is contained in:
Simon Ser 2025-10-28 20:45:41 +01:00 • committed by Simon Zeni
parent e8f9e9eea6
commit 2fbc0b5ac1
2 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -197,6 +197,8 @@ struct wlr_scene_buffer {
pixman_region32_t opaque_region; pixman_region32_t opaque_region;
enum wlr_color_transfer_function transfer_function; enum wlr_color_transfer_function transfer_function;
enum wlr_color_named_primaries primaries; enum wlr_color_named_primaries primaries;
enum wlr_color_encoding color_encoding;
enum wlr_color_range color_range;
struct { struct {
uint64_t active_outputs; uint64_t active_outputs;
@ -564,6 +566,12 @@ void wlr_scene_buffer_set_transfer_function(struct wlr_scene_buffer *scene_buffe
void wlr_scene_buffer_set_primaries(struct wlr_scene_buffer *scene_buffer, void wlr_scene_buffer_set_primaries(struct wlr_scene_buffer *scene_buffer,
enum wlr_color_named_primaries primaries); enum wlr_color_named_primaries primaries);
void wlr_scene_buffer_set_color_encoding(struct wlr_scene_buffer *scene_buffer,
enum wlr_color_encoding encoding);
void wlr_scene_buffer_set_color_range(struct wlr_scene_buffer *scene_buffer,
enum wlr_color_range range);
/** /**
* Calls the buffer's frame_done signal. * Calls the buffer's frame_done signal.
*/ */

27
types/scene/wlr_scene.c
View file

@ -1121,6 +1121,26 @@ void wlr_scene_buffer_set_primaries(struct wlr_scene_buffer *scene_buffer,
scene_node_update(&scene_buffer->node, NULL); scene_node_update(&scene_buffer->node, NULL);
} }
void wlr_scene_buffer_set_color_encoding(struct wlr_scene_buffer *scene_buffer,
enum wlr_color_encoding color_encoding) {
if (scene_buffer->color_encoding == color_encoding) {
return;
}
scene_buffer->color_encoding = color_encoding;
scene_node_update(&scene_buffer->node, NULL);
}
void wlr_scene_buffer_set_color_range(struct wlr_scene_buffer *scene_buffer,
enum wlr_color_range color_range) {
if (scene_buffer->color_range == color_range) {
return;
}
scene_buffer->color_range = color_range;
scene_node_update(&scene_buffer->node, NULL);
}
static struct wlr_texture *scene_buffer_get_texture( static struct wlr_texture *scene_buffer_get_texture(
struct wlr_scene_buffer *scene_buffer, struct wlr_renderer *renderer) { struct wlr_scene_buffer *scene_buffer, struct wlr_renderer *renderer) {
if (scene_buffer->buffer == NULL || scene_buffer->texture != NULL) { if (scene_buffer->buffer == NULL || scene_buffer->texture != NULL) {
@ -1475,6 +1495,8 @@ static void scene_entry_render(struct render_list_entry *entry, const struct ren
WLR_RENDER_BLEND_MODE_PREMULTIPLIED : WLR_RENDER_BLEND_MODE_NONE, WLR_RENDER_BLEND_MODE_PREMULTIPLIED : WLR_RENDER_BLEND_MODE_NONE,
.transfer_function = scene_buffer->transfer_function, .transfer_function = scene_buffer->transfer_function,
.primaries = scene_buffer->primaries != 0 ? &primaries : NULL, .primaries = scene_buffer->primaries != 0 ? &primaries : NULL,
.color_encoding = scene_buffer->color_encoding,
.color_range = scene_buffer->color_range,
.wait_timeline = scene_buffer->wait_timeline, .wait_timeline = scene_buffer->wait_timeline,
.wait_point = scene_buffer->wait_point, .wait_point = scene_buffer->wait_point,
}); });
@ -2015,6 +2037,11 @@ static enum scene_direct_scanout_result scene_entry_try_direct_scanout(
return SCANOUT_INELIGIBLE; return SCANOUT_INELIGIBLE;
} }
if (buffer->color_encoding != WLR_COLOR_ENCODING_NONE ||
buffer->color_range != WLR_COLOR_RANGE_NONE) {
return SCANOUT_INELIGIBLE;
}
// We want to ensure optimal buffer selection, but as direct-scanout can be enabled and disabled // We want to ensure optimal buffer selection, but as direct-scanout can be enabled and disabled
// on a frame-by-frame basis, we wait for a few frames to send the new format recommendations. // on a frame-by-frame basis, we wait for a few frames to send the new format recommendations.
// Maybe we should only send feedback in this case if tests fail. // Maybe we should only send feedback in this case if tests fail.