color_management_v1: drop duplicated enum converters

This commit is contained in:
Simon Ser 2025-07-29 19:15:12 +02:00 committed by Simon Zeni
parent 108d94f798
commit 845a7a581d

View file

@ -65,18 +65,6 @@ static void resource_handle_destroy(struct wl_client *client, struct wl_resource
wl_resource_destroy(resource);
}
static enum wlr_color_named_primaries named_primaries_to_wlr(
enum wp_color_manager_v1_primaries primaries) {
switch (primaries) {
case WP_COLOR_MANAGER_V1_PRIMARIES_SRGB:
return WLR_COLOR_NAMED_PRIMARIES_SRGB;
case WP_COLOR_MANAGER_V1_PRIMARIES_BT2020:
return WLR_COLOR_NAMED_PRIMARIES_BT2020;
default:
abort();
}
}
static enum wp_color_manager_v1_primaries named_primaries_from_wlr(
enum wlr_color_named_primaries primaries) {
switch (primaries) {
@ -88,20 +76,6 @@ static enum wp_color_manager_v1_primaries named_primaries_from_wlr(
abort();
}
static enum wlr_color_transfer_function transfer_function_to_wlr(
enum wp_color_manager_v1_transfer_function tf) {
switch (tf) {
case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB:
return WLR_COLOR_TRANSFER_FUNCTION_SRGB;
case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ:
return WLR_COLOR_TRANSFER_FUNCTION_ST2084_PQ;
case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR:
return WLR_COLOR_TRANSFER_FUNCTION_EXT_LINEAR;
default:
abort();
}
}
static enum wp_color_manager_v1_transfer_function transfer_function_from_wlr(
enum wlr_color_transfer_function tf) {
switch (tf) {
@ -156,10 +130,12 @@ static void image_desc_handle_get_information(struct wl_client *client,
}
struct wlr_color_primaries primaries;
wlr_color_primaries_from_named(&primaries, named_primaries_to_wlr(image_desc->data.primaries_named));
wlr_color_primaries_from_named(&primaries,
wlr_color_manager_v1_primaries_to_wlr(image_desc->data.primaries_named));
struct wlr_color_luminances luminances;
wlr_color_transfer_function_get_default_luminance(transfer_function_to_wlr(image_desc->data.tf_named), &luminances);
wlr_color_transfer_function_get_default_luminance(
wlr_color_manager_v1_transfer_function_to_wlr(image_desc->data.tf_named), &luminances);
wp_image_description_info_v1_send_primaries_named(resource, image_desc->data.primaries_named);
wp_image_description_info_v1_send_primaries(resource,