mirror of
https://gitlab.freedesktop.org/wlroots/wlroots.git
synced 2025-12-24 10:00:05 +01:00
scene: add transfer function support for wlr_scene_buffer
This commit is contained in:
parent
8d1c6e42ac
commit
4efec11721
2 changed files with 18 additions and 0 deletions
|
|
@ -192,6 +192,7 @@ struct wlr_scene_buffer {
|
||||||
int dst_width, dst_height;
|
int dst_width, dst_height;
|
||||||
enum wl_output_transform transform;
|
enum wl_output_transform transform;
|
||||||
pixman_region32_t opaque_region;
|
pixman_region32_t opaque_region;
|
||||||
|
enum wlr_color_transfer_function transfer_function;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
uint64_t active_outputs;
|
uint64_t active_outputs;
|
||||||
|
|
@ -541,6 +542,9 @@ void wlr_scene_buffer_set_opacity(struct wlr_scene_buffer *scene_buffer,
|
||||||
void wlr_scene_buffer_set_filter_mode(struct wlr_scene_buffer *scene_buffer,
|
void wlr_scene_buffer_set_filter_mode(struct wlr_scene_buffer *scene_buffer,
|
||||||
enum wlr_scale_filter_mode filter_mode);
|
enum wlr_scale_filter_mode filter_mode);
|
||||||
|
|
||||||
|
void wlr_scene_buffer_set_transfer_function(struct wlr_scene_buffer *scene_buffer,
|
||||||
|
enum wlr_color_transfer_function transfer_function);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calls the buffer's frame_done signal.
|
* Calls the buffer's frame_done signal.
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -1099,6 +1099,16 @@ void wlr_scene_buffer_set_filter_mode(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_transfer_function(struct wlr_scene_buffer *scene_buffer,
|
||||||
|
enum wlr_color_transfer_function transfer_function) {
|
||||||
|
if (scene_buffer->transfer_function == transfer_function) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
scene_buffer->transfer_function = transfer_function;
|
||||||
|
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) {
|
||||||
|
|
@ -1446,6 +1456,7 @@ static void scene_entry_render(struct render_list_entry *entry, const struct ren
|
||||||
.blend_mode = !data->output->scene->calculate_visibility ||
|
.blend_mode = !data->output->scene->calculate_visibility ||
|
||||||
!pixman_region32_empty(&opaque) ?
|
!pixman_region32_empty(&opaque) ?
|
||||||
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,
|
||||||
.wait_timeline = scene_buffer->wait_timeline,
|
.wait_timeline = scene_buffer->wait_timeline,
|
||||||
.wait_point = scene_buffer->wait_point,
|
.wait_point = scene_buffer->wait_point,
|
||||||
});
|
});
|
||||||
|
|
@ -1936,6 +1947,9 @@ static enum scene_direct_scanout_result scene_entry_try_direct_scanout(
|
||||||
if (buffer->transform != data->transform) {
|
if (buffer->transform != data->transform) {
|
||||||
return SCANOUT_INELIGIBLE;
|
return SCANOUT_INELIGIBLE;
|
||||||
}
|
}
|
||||||
|
if (buffer->transfer_function != 0 && buffer->transfer_function != WLR_COLOR_TRANSFER_FUNCTION_SRGB) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// 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.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue