Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for BT2020 primaries #8553

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Add support for BT2020 primaries #8553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sway/commands/output/color_profile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ struct cmd_results *output_cmd_color_profile(int argc, char **argv) {
free(icc_path);

struct wlr_color_transform *tmp =
wlr_color_transform_init_linear_to_icc(data, size);
wlr_color_transform_init_linear_to_icc(WLR_COLOR_NAMED_PRIMARIES_SRGB, data, size);
if (!tmp) {
free(data);
return cmd_results_new(CMD_FAILURE,
Expand Down
15 changes: 15 additions & 0 deletions sway/config/output.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,15 @@ static void queue_output_config(struct output_config *oc,
} else {
wlr_output_state_set_render_format(pending, DRM_FORMAT_XRGB8888);
}

if (oc && oc->color_transform == NULL && oc->render_bit_depth == RENDER_BIT_DEPTH_10 &&
(wlr_output->supported_primaries & WLR_COLOR_NAMED_PRIMARIES_BT2020) &&
server.renderer->features.output_color_transform) {
const struct wlr_output_image_description image_desc = {
.primaries = WLR_COLOR_NAMED_PRIMARIES_BT2020,
};
wlr_output_state_set_image_description(pending, &image_desc);
}
}

static bool finalize_output_config(struct output_config *oc, struct sway_output *output) {
Expand Down Expand Up @@ -549,6 +558,12 @@ static bool finalize_output_config(struct output_config *oc, struct sway_output
output->color_transform = NULL;
}

if (output->color_transform == NULL && oc && oc->render_bit_depth == RENDER_BIT_DEPTH_10 &&
(wlr_output->supported_primaries & WLR_COLOR_NAMED_PRIMARIES_BT2020) &&
server.renderer->features.output_color_transform) {
output->color_transform = wlr_color_transform_init_srgb(WLR_COLOR_NAMED_PRIMARIES_BT2020);
}

output->max_render_time = oc && oc->max_render_time > 0 ? oc->max_render_time : 0;
output->allow_tearing = oc && oc->allow_tearing > 0;

Expand Down