mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

color_management_v1: make from_wlr enum converters public

Browse source 
This can be useful for compositors to set surface feedback.
This commit is contained in:
Simon Ser 2025-07-29 19:18:10 +02:00 • committed by Simon Zeni
parent 845a7a581d
commit 138210f01c
2 changed files with 38 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

12
include/wlr/types/wlr_color_management_v1.h
View file

@ -96,6 +96,12 @@ void wlr_color_manager_v1_set_surface_preferred_image_description(
enum wlr_color_transfer_function enum wlr_color_transfer_function
wlr_color_manager_v1_transfer_function_to_wlr(enum wp_color_manager_v1_transfer_function tf); wlr_color_manager_v1_transfer_function_to_wlr(enum wp_color_manager_v1_transfer_function tf);
/**
* Convert an enum wlr_color_transfer_function value into a protocol transfer function.
*/
enum wp_color_manager_v1_transfer_function
wlr_color_manager_v1_transfer_function_from_wlr(enum wlr_color_transfer_function tf);
/** /**
* Convert a protocol named primaries to enum wlr_color_named_primaries. * Convert a protocol named primaries to enum wlr_color_named_primaries.
* Aborts if there is no matching wlroots entry. * Aborts if there is no matching wlroots entry.
@ -103,4 +109,10 @@ wlr_color_manager_v1_transfer_function_to_wlr(enum wp_color_manager_v1_transfer_
enum wlr_color_named_primaries enum wlr_color_named_primaries
wlr_color_manager_v1_primaries_to_wlr(enum wp_color_manager_v1_primaries primaries); wlr_color_manager_v1_primaries_to_wlr(enum wp_color_manager_v1_primaries primaries);
/**
* Convert an enum wlr_color_named_primaries value into protocol primaries.
*/
enum wp_color_manager_v1_primaries
wlr_color_manager_v1_primaries_from_wlr(enum wlr_color_named_primaries primaries);
#endif #endif

52
types/wlr_color_management_v1.c
View file

@ -65,30 +65,6 @@ static void resource_handle_destroy(struct wl_client *client, struct wl_resource
wl_resource_destroy(resource); wl_resource_destroy(resource);
} }
static enum wp_color_manager_v1_primaries named_primaries_from_wlr(
enum wlr_color_named_primaries primaries) {
switch (primaries) {
case WLR_COLOR_NAMED_PRIMARIES_SRGB:
return WP_COLOR_MANAGER_V1_PRIMARIES_SRGB;
case WLR_COLOR_NAMED_PRIMARIES_BT2020:
return WP_COLOR_MANAGER_V1_PRIMARIES_BT2020;
}
abort();
}
static enum wp_color_manager_v1_transfer_function transfer_function_from_wlr(
enum wlr_color_transfer_function tf) {
switch (tf) {
case WLR_COLOR_TRANSFER_FUNCTION_SRGB:
return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB;
case WLR_COLOR_TRANSFER_FUNCTION_ST2084_PQ:
return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ;
case WLR_COLOR_TRANSFER_FUNCTION_EXT_LINEAR:
return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR;
}
abort();
}
static int32_t encode_cie1931_coord(float value) { static int32_t encode_cie1931_coord(float value) {
return round(value * 1000 * 1000); return round(value * 1000 * 1000);
} }
@ -241,8 +217,8 @@ static void cm_output_handle_get_image_description(struct wl_client *client,
}; };
const struct wlr_output_image_description *image_desc = cm_output->output->image_description; const struct wlr_output_image_description *image_desc = cm_output->output->image_description;
if (image_desc != NULL) { if (image_desc != NULL) {
data.tf_named = transfer_function_from_wlr(image_desc->transfer_function); data.tf_named = wlr_color_manager_v1_transfer_function_from_wlr(image_desc->transfer_function);
data.primaries_named = named_primaries_from_wlr(image_desc->primaries); data.primaries_named = wlr_color_manager_v1_primaries_from_wlr(image_desc->primaries);
} }
image_desc_create_ready(cm_output->manager, cm_output_resource, id, &data, true); image_desc_create_ready(cm_output->manager, cm_output_resource, id, &data, true);
} }
@ -1019,6 +995,19 @@ wlr_color_manager_v1_transfer_function_to_wlr(enum wp_color_manager_v1_transfer_
} }
} }
enum wp_color_manager_v1_transfer_function
wlr_color_manager_v1_transfer_function_from_wlr(enum wlr_color_transfer_function tf) {
switch (tf) {
case WLR_COLOR_TRANSFER_FUNCTION_SRGB:
return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB;
case WLR_COLOR_TRANSFER_FUNCTION_ST2084_PQ:
return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ;
case WLR_COLOR_TRANSFER_FUNCTION_EXT_LINEAR:
return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR;
}
abort();
}
enum wlr_color_named_primaries enum wlr_color_named_primaries
wlr_color_manager_v1_primaries_to_wlr(enum wp_color_manager_v1_primaries primaries) { wlr_color_manager_v1_primaries_to_wlr(enum wp_color_manager_v1_primaries primaries) {
switch (primaries) { switch (primaries) {
@ -1030,3 +1019,14 @@ wlr_color_manager_v1_primaries_to_wlr(enum wp_color_manager_v1_primaries primari
abort(); abort();
} }
} }
enum wp_color_manager_v1_primaries
wlr_color_manager_v1_primaries_from_wlr(enum wlr_color_named_primaries primaries) {
switch (primaries) {
case WLR_COLOR_NAMED_PRIMARIES_SRGB:
return WP_COLOR_MANAGER_V1_PRIMARIES_SRGB;
case WLR_COLOR_NAMED_PRIMARIES_BT2020:
return WP_COLOR_MANAGER_V1_PRIMARIES_BT2020;
}
abort();
}