diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 652875e5b..35225c2ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -106,7 +106,7 @@ variables: - .skip-git-clone variables: FDO_DISTRIBUTION_VERSION: 41 - BASE_TAG: '2025-02-13.0' + BASE_TAG: '2025-02-19.1' MUTTER_USER: 'meta-user' FDO_DISTRIBUTION_PACKAGES: accountsservice-devel @@ -158,10 +158,6 @@ variables: https://gitlab.gnome.org/GNOME/gi-docgen.git \ main - ./.gitlab-ci/install-meson-project.sh \ - https://gitlab.freedesktop.org/wayland/wayland-protocols.git \ - 1.38 - ./.gitlab-ci/install-common-dependencies.sh rpm -e --nodeps gnome-bluetooth-libs-devel \ diff --git a/.gitlab-ci/install-common-dependencies.sh b/.gitlab-ci/install-common-dependencies.sh index 824adba4d..20e5124b7 100755 --- a/.gitlab-ci/install-common-dependencies.sh +++ b/.gitlab-ci/install-common-dependencies.sh @@ -149,3 +149,11 @@ then https://gitlab.gnome.org/GNOME/gjs.git \ master fi + +if ! pkgconf --atleast-version 1.41 wayland-protocols +then + ./$SCRIPTS_DIR/install-meson-project.sh \ + "${OPTIONS[@]}" \ + https://gitlab.freedesktop.org/wayland/wayland-protocols.git \ + 1.41 +fi diff --git a/clutter/clutter/clutter-color-state-params.c b/clutter/clutter/clutter-color-state-params.c index 2e343034a..984be7771 100644 --- a/clutter/clutter/clutter-color-state-params.c +++ b/clutter/clutter/clutter-color-state-params.c @@ -149,6 +149,13 @@ static const ClutterLuminance sdr_default_luminance = { .ref = 80.0f, }; +static const ClutterLuminance bt709_default_luminance = { + .type = CLUTTER_LUMINANCE_TYPE_DERIVED, + .min = 0.01f, + .max = 100.0f, + .ref = 100.0f, +}; + static const ClutterLuminance pq_default_luminance = { .type = CLUTTER_LUMINANCE_TYPE_DERIVED, .min = 0.005f, @@ -165,9 +172,10 @@ clutter_eotf_get_default_luminance (ClutterEOTF eotf) switch (eotf.tf_name) { case CLUTTER_TRANSFER_FUNCTION_SRGB: - case CLUTTER_TRANSFER_FUNCTION_BT709: case CLUTTER_TRANSFER_FUNCTION_LINEAR: return &sdr_default_luminance; + case CLUTTER_TRANSFER_FUNCTION_BT709: + return &bt709_default_luminance; case CLUTTER_TRANSFER_FUNCTION_PQ: return &pq_default_luminance; } diff --git a/meson.build b/meson.build index f13554d21..953e6ed68 100644 --- a/meson.build +++ b/meson.build @@ -47,7 +47,7 @@ gudev_req = '>= 238' # wayland version requirements wayland_server_req = '>= 1.23' -wayland_protocols_req = '>= 1.38' +wayland_protocols_req = '>= 1.41' # native backend version requirements libinput_req = '>= 1.27.0' diff --git a/src/meson.build b/src/meson.build index 12583cac2..b0c103b0c 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1118,7 +1118,7 @@ if have_wayland # - protocol stability ('private', 'stable' or 'unstable') # - protocol version (if stability is 'unstable') wayland_protocols = [ - ['color-management-v1', 'private', ], + ['color-management', 'staging', 'v1', ], ['commit-timing', 'staging', 'v1', ], ['cursor-shape-v1', 'private', ], ['drm-lease', 'staging', 'v1', ], diff --git a/src/tests/wayland-test-clients/color-management.c b/src/tests/wayland-test-clients/color-management.c index de3b88818..ac01700e6 100644 --- a/src/tests/wayland-test-clients/color-management.c +++ b/src/tests/wayland-test-clients/color-management.c @@ -90,6 +90,12 @@ wait_for_configure (WaylandDisplay *display) wayland_display_dispatch (display); } +static uint32_t +float_to_scaled_uint32_chromaticity (float value) +{ + return (uint32_t) (value * 1000000); +} + static uint32_t float_to_scaled_uint32 (float value) { @@ -98,7 +104,7 @@ float_to_scaled_uint32 (float value) static void handle_image_description_failed (void *data, - struct xx_image_description_v4 *image_description_v4, + struct wp_image_description_v1 *image_description_v4, uint32_t cause, const char *msg) @@ -110,7 +116,7 @@ handle_image_description_failed (void *data, static void handle_image_description_ready (void *data, - struct xx_image_description_v4 *image_description_v4, + struct wp_image_description_v1 *image_description_v4, uint32_t identity) { ImageDescriptionContext *image_description_context = data; @@ -118,7 +124,7 @@ handle_image_description_ready (void *data, image_description_context->image_description_id = identity; } -static const struct xx_image_description_v4_listener image_description_listener = { +static const struct wp_image_description_v1_listener image_description_listener = { handle_image_description_failed, handle_image_description_ready, }; @@ -134,7 +140,7 @@ wait_for_image_description_ready (ImageDescriptionContext *image_description, static void create_image_description_from_params (WaylandDisplay *display, - struct xx_image_description_v4 **image_description, + struct wp_image_description_v1 **image_description, int primaries_named, Primaries *primaries, int tf_named, @@ -144,41 +150,41 @@ create_image_description_from_params (WaylandDisplay *display, float ref_lum) { - struct xx_image_description_creator_params_v4 *creator_params; + struct wp_image_description_creator_params_v1 *creator_params; ImageDescriptionContext image_description_context; creator_params = - xx_color_manager_v4_new_parametric_creator (display->color_management_mgr); + wp_color_manager_v1_create_parametric_creator (display->color_management_mgr); if (primaries_named != -1) - xx_image_description_creator_params_v4_set_primaries_named ( + wp_image_description_creator_params_v1_set_primaries_named ( creator_params, primaries_named); if (primaries) - xx_image_description_creator_params_v4_set_primaries ( + wp_image_description_creator_params_v1_set_primaries ( creator_params, - float_to_scaled_uint32 (primaries->r_x), - float_to_scaled_uint32 (primaries->r_y), - float_to_scaled_uint32 (primaries->g_x), - float_to_scaled_uint32 (primaries->g_y), - float_to_scaled_uint32 (primaries->b_x), - float_to_scaled_uint32 (primaries->b_y), - float_to_scaled_uint32 (primaries->w_x), - float_to_scaled_uint32 (primaries->w_y)); + float_to_scaled_uint32_chromaticity (primaries->r_x), + float_to_scaled_uint32_chromaticity (primaries->r_y), + float_to_scaled_uint32_chromaticity (primaries->g_x), + float_to_scaled_uint32_chromaticity (primaries->g_y), + float_to_scaled_uint32_chromaticity (primaries->b_x), + float_to_scaled_uint32_chromaticity (primaries->b_y), + float_to_scaled_uint32_chromaticity (primaries->w_x), + float_to_scaled_uint32_chromaticity (primaries->w_y)); if (tf_named != -1) - xx_image_description_creator_params_v4_set_tf_named ( + wp_image_description_creator_params_v1_set_tf_named ( creator_params, tf_named); if (tf_power >= 1.0f) - xx_image_description_creator_params_v4_set_tf_power ( + wp_image_description_creator_params_v1_set_tf_power ( creator_params, float_to_scaled_uint32 (tf_power)); if (min_lum >= 0.0f && max_lum > 0.0f && ref_lum >= 0.0f) - xx_image_description_creator_params_v4_set_luminances ( + wp_image_description_creator_params_v1_set_luminances ( creator_params, float_to_scaled_uint32 (min_lum), (uint32_t) max_lum, @@ -188,8 +194,8 @@ create_image_description_from_params (WaylandDisplay *display, image_description_context.creation_failed = FALSE; *image_description = - xx_image_description_creator_params_v4_create (creator_params); - xx_image_description_v4_add_listener ( + wp_image_description_creator_params_v1_create (creator_params); + wp_image_description_v1_add_listener ( *image_description, &image_description_listener, &image_description_context); @@ -208,8 +214,8 @@ main (int argc, struct xdg_toplevel *xdg_toplevel; struct xdg_surface *xdg_surface; struct wl_surface *surface; - struct xx_color_management_surface_v4 *color_surface; - struct xx_image_description_v4 *image_description; + struct wp_color_management_surface_v1 *color_surface; + struct wp_image_description_v1 *image_description; display = wayland_display_new (WAYLAND_DISPLAY_CAPABILITY_TEST_DRIVER); @@ -220,7 +226,7 @@ main (int argc, xdg_toplevel_add_listener (xdg_toplevel, &xdg_toplevel_listener, NULL); xdg_toplevel_set_title (xdg_toplevel, "color-management"); color_surface = - xx_color_manager_v4_get_surface (display->color_management_mgr, surface); + wp_color_manager_v1_get_surface (display->color_management_mgr, surface); wl_surface_commit (surface); wait_for_configure (display); @@ -230,42 +236,42 @@ main (int argc, create_image_description_from_params (display, &image_description, - XX_COLOR_MANAGER_V4_PRIMARIES_BT2020, + WP_COLOR_MANAGER_V1_PRIMARIES_BT2020, NULL, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_ST2084_PQ, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ, -1.0f, 0.005f, 10000.0f, 303.0f); - xx_color_management_surface_v4_set_image_description ( + wp_color_management_surface_v1_set_image_description ( color_surface, image_description, - XX_COLOR_MANAGER_V4_RENDER_INTENT_PERCEPTUAL); + WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL); wl_surface_commit (surface); - xx_image_description_v4_destroy (image_description); + wp_image_description_v1_destroy (image_description); test_driver_sync_point (display->test_driver, 1, NULL); wait_for_sync_event (display, 1); create_image_description_from_params (display, &image_description, - XX_COLOR_MANAGER_V4_PRIMARIES_SRGB, + WP_COLOR_MANAGER_V1_PRIMARIES_SRGB, NULL, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_SRGB, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB, -1.0f, 0.2f, 80.0f, 70.0f); - xx_color_management_surface_v4_set_image_description ( + wp_color_management_surface_v1_set_image_description ( color_surface, image_description, - XX_COLOR_MANAGER_V4_RENDER_INTENT_PERCEPTUAL); + WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL); wl_surface_commit (surface); - xx_image_description_v4_destroy (image_description); + wp_image_description_v1_destroy (image_description); test_driver_sync_point (display->test_driver, 2, NULL); wait_for_sync_event (display, 2); @@ -279,19 +285,19 @@ main (int argc, -1.0f, -1.0f, -1.0f); - xx_color_management_surface_v4_set_image_description ( + wp_color_management_surface_v1_set_image_description ( color_surface, image_description, - XX_COLOR_MANAGER_V4_RENDER_INTENT_PERCEPTUAL); + WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL); wl_surface_commit (surface); - xx_image_description_v4_destroy (image_description); + wp_image_description_v1_destroy (image_description); test_driver_sync_point (display->test_driver, 3, NULL); wait_for_sync_event (display, 3); - xx_color_management_surface_v4_destroy (color_surface); + wp_color_management_surface_v1_destroy (color_surface); return EXIT_SUCCESS; } diff --git a/src/tests/wayland-test-clients/wayland-test-client-utils.c b/src/tests/wayland-test-clients/wayland-test-client-utils.c index a23a08382..a539e26aa 100644 --- a/src/tests/wayland-test-clients/wayland-test-client-utils.c +++ b/src/tests/wayland-test-clients/wayland-test-client-utils.c @@ -448,11 +448,11 @@ handle_registry_global (void *user_data, wl_registry_bind (registry, id, &wp_single_pixel_buffer_manager_v1_interface, 1); } - else if (strcmp (interface, xx_color_manager_v4_interface.name) == 0) + else if (strcmp (interface, wp_color_manager_v1_interface.name) == 0) { display->color_management_mgr = wl_registry_bind (registry, id, - &xx_color_manager_v4_interface, 1); + &wp_color_manager_v1_interface, 1); } else if (strcmp (interface, wp_viewporter_interface.name) == 0) { diff --git a/src/tests/wayland-test-clients/wayland-test-client-utils.h b/src/tests/wayland-test-clients/wayland-test-client-utils.h index cedadfb30..dadddf6c4 100644 --- a/src/tests/wayland-test-clients/wayland-test-client-utils.h +++ b/src/tests/wayland-test-clients/wayland-test-client-utils.h @@ -43,7 +43,7 @@ typedef struct _WaylandDisplay struct zwp_linux_dmabuf_v1 *linux_dmabuf; struct wp_fractional_scale_manager_v1 *fractional_scale_mgr; struct wp_single_pixel_buffer_manager_v1 *single_pixel_mgr; - struct xx_color_manager_v4 *color_management_mgr; + struct wp_color_manager_v1 *color_management_mgr; struct wp_viewporter *viewporter; struct xdg_wm_base *xdg_wm_base; struct wl_seat *wl_seat; diff --git a/src/wayland/meta-wayland-color-management.c b/src/wayland/meta-wayland-color-management.c index cf2de9865..1c824f439 100644 --- a/src/wayland/meta-wayland-color-management.c +++ b/src/wayland/meta-wayland-color-management.c @@ -166,6 +166,18 @@ get_clutter_color_manager (MetaWaylandColorManager *color_manager) return clutter_context_get_color_manager (clutter_context); } +static float +scaled_uint32_to_float_chromaticity (uint32_t value) +{ + return value * 0.000001f; +} + +static uint32_t +float_to_scaled_uint32_chromaticity (float value) +{ + return (uint32_t) (value * 1000000); +} + static float scaled_uint32_to_float (uint32_t value) { @@ -179,28 +191,28 @@ float_to_scaled_uint32 (float value) } static gboolean -wayland_tf_to_clutter (enum xx_color_manager_v4_transfer_function tf, +wayland_tf_to_clutter (enum wp_color_manager_v1_transfer_function tf, ClutterEOTF *eotf) { switch (tf) { - case XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_GAMMA22: + case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22: eotf->type = CLUTTER_EOTF_TYPE_GAMMA; eotf->gamma_exp = 2.2f; return TRUE; - case XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_GAMMA28: + case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA28: eotf->type = CLUTTER_EOTF_TYPE_GAMMA; eotf->gamma_exp = 2.8f; return TRUE; - case XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_SRGB: + case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB: eotf->type = CLUTTER_EOTF_TYPE_NAMED; eotf->tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB; return TRUE; - case XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_ST2084_PQ: + case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ: eotf->type = CLUTTER_EOTF_TYPE_NAMED; eotf->tf_name = CLUTTER_TRANSFER_FUNCTION_PQ; return TRUE; - case XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_BT709: + case WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_BT1886: eotf->type = CLUTTER_EOTF_TYPE_NAMED; eotf->tf_name = CLUTTER_TRANSFER_FUNCTION_BT709; return TRUE; @@ -209,38 +221,38 @@ wayland_tf_to_clutter (enum xx_color_manager_v4_transfer_function tf, } } -static enum xx_color_manager_v4_transfer_function +static enum wp_color_manager_v1_transfer_function clutter_tf_to_wayland (ClutterTransferFunction tf) { switch (tf) { case CLUTTER_TRANSFER_FUNCTION_SRGB: - return XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_SRGB; + return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB; case CLUTTER_TRANSFER_FUNCTION_PQ: - return XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_ST2084_PQ; + return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ; case CLUTTER_TRANSFER_FUNCTION_BT709: - return XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_BT709; + return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_BT1886; case CLUTTER_TRANSFER_FUNCTION_LINEAR: - return XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_LINEAR; + return WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_EXT_LINEAR; } g_assert_not_reached (); } static gboolean -wayland_primaries_to_clutter (enum xx_color_manager_v4_primaries primaries, +wayland_primaries_to_clutter (enum wp_color_manager_v1_primaries primaries, ClutterColorimetry *colorimetry) { switch (primaries) { - case XX_COLOR_MANAGER_V4_PRIMARIES_SRGB: + case WP_COLOR_MANAGER_V1_PRIMARIES_SRGB: colorimetry->type = CLUTTER_COLORIMETRY_TYPE_COLORSPACE; colorimetry->colorspace = CLUTTER_COLORSPACE_SRGB; return TRUE; - case XX_COLOR_MANAGER_V4_PRIMARIES_BT2020: + case WP_COLOR_MANAGER_V1_PRIMARIES_BT2020: colorimetry->type = CLUTTER_COLORIMETRY_TYPE_COLORSPACE; colorimetry->colorspace = CLUTTER_COLORSPACE_BT2020; return TRUE; - case XX_COLOR_MANAGER_V4_PRIMARIES_NTSC: + case WP_COLOR_MANAGER_V1_PRIMARIES_NTSC: colorimetry->type = CLUTTER_COLORIMETRY_TYPE_COLORSPACE; colorimetry->colorspace = CLUTTER_COLORSPACE_NTSC; return TRUE; @@ -249,17 +261,17 @@ wayland_primaries_to_clutter (enum xx_color_manager_v4_primaries primaries, } } -static enum xx_color_manager_v4_primaries +static enum wp_color_manager_v1_primaries clutter_colorspace_to_wayland (ClutterColorspace colorspace) { switch (colorspace) { case CLUTTER_COLORSPACE_SRGB: - return XX_COLOR_MANAGER_V4_PRIMARIES_SRGB; + return WP_COLOR_MANAGER_V1_PRIMARIES_SRGB; case CLUTTER_COLORSPACE_BT2020: - return XX_COLOR_MANAGER_V4_PRIMARIES_BT2020; + return WP_COLOR_MANAGER_V1_PRIMARIES_BT2020; case CLUTTER_COLORSPACE_NTSC: - return XX_COLOR_MANAGER_V4_PRIMARIES_NTSC; + return WP_COLOR_MANAGER_V1_PRIMARIES_NTSC; } g_assert_not_reached (); } @@ -307,7 +319,7 @@ meta_wayland_image_description_new (MetaWaylandColorManager *color_manager, static MetaWaylandImageDescription * meta_wayland_image_description_new_failed (MetaWaylandColorManager *color_manager, struct wl_resource *resource, - enum xx_image_description_v4_cause cause, + enum wp_image_description_v1_cause cause, const char *message) { MetaWaylandImageDescription *image_desc; @@ -315,7 +327,7 @@ meta_wayland_image_description_new_failed (MetaWaylandColorManager *c image_desc = meta_wayland_image_description_new (color_manager, resource); image_desc->state = META_WAYLAND_IMAGE_DESCRIPTION_STATE_FAILED; image_desc->has_info = FALSE; - xx_image_description_v4_send_failed (resource, cause, message); + wp_image_description_v1_send_failed (resource, cause, message); return image_desc; } @@ -332,7 +344,7 @@ meta_wayland_image_description_new_color_state (MetaWaylandColorManager image_desc->state = META_WAYLAND_IMAGE_DESCRIPTION_STATE_READY; image_desc->has_info = !!(flags & META_WAYLAND_IMAGE_DESCRIPTION_FLAGS_ALLOW_INFO); image_desc->color_state = g_object_ref (color_state); - xx_image_description_v4_send_ready (resource, + wp_image_description_v1_send_ready (resource, clutter_color_state_get_id (color_state)); return image_desc; @@ -365,8 +377,8 @@ static void send_information (struct wl_resource *info_resource, ClutterColorState *color_state) { - enum xx_color_manager_v4_primaries primaries_named; - enum xx_color_manager_v4_transfer_function tf; + enum wp_color_manager_v1_primaries primaries_named; + enum wp_color_manager_v1_transfer_function tf; ClutterColorStateParams *color_state_params; const ClutterColorimetry *colorimetry; const ClutterPrimaries *primaries; @@ -380,32 +392,32 @@ send_information (struct wl_resource *info_resource, { case CLUTTER_COLORIMETRY_TYPE_COLORSPACE: primaries_named = clutter_colorspace_to_wayland (colorimetry->colorspace); - xx_image_description_info_v4_send_primaries_named (info_resource, + wp_image_description_info_v1_send_primaries_named (info_resource, primaries_named); primaries = clutter_colorspace_to_primaries (colorimetry->colorspace); - xx_image_description_info_v4_send_primaries ( + wp_image_description_info_v1_send_primaries ( info_resource, - float_to_scaled_uint32 (primaries->r_x), - float_to_scaled_uint32 (primaries->r_y), - float_to_scaled_uint32 (primaries->g_x), - float_to_scaled_uint32 (primaries->g_y), - float_to_scaled_uint32 (primaries->b_x), - float_to_scaled_uint32 (primaries->b_y), - float_to_scaled_uint32 (primaries->w_x), - float_to_scaled_uint32 (primaries->w_y)); + float_to_scaled_uint32_chromaticity (primaries->r_x), + float_to_scaled_uint32_chromaticity (primaries->r_y), + float_to_scaled_uint32_chromaticity (primaries->g_x), + float_to_scaled_uint32_chromaticity (primaries->g_y), + float_to_scaled_uint32_chromaticity (primaries->b_x), + float_to_scaled_uint32_chromaticity (primaries->b_y), + float_to_scaled_uint32_chromaticity (primaries->w_x), + float_to_scaled_uint32_chromaticity (primaries->w_y)); break; case CLUTTER_COLORIMETRY_TYPE_PRIMARIES: - xx_image_description_info_v4_send_primaries ( + wp_image_description_info_v1_send_primaries ( info_resource, - float_to_scaled_uint32 (colorimetry->primaries->r_x), - float_to_scaled_uint32 (colorimetry->primaries->r_y), - float_to_scaled_uint32 (colorimetry->primaries->g_x), - float_to_scaled_uint32 (colorimetry->primaries->g_y), - float_to_scaled_uint32 (colorimetry->primaries->b_x), - float_to_scaled_uint32 (colorimetry->primaries->b_y), - float_to_scaled_uint32 (colorimetry->primaries->w_x), - float_to_scaled_uint32 (colorimetry->primaries->w_y)); + float_to_scaled_uint32_chromaticity (colorimetry->primaries->r_x), + float_to_scaled_uint32_chromaticity (colorimetry->primaries->r_y), + float_to_scaled_uint32_chromaticity (colorimetry->primaries->g_x), + float_to_scaled_uint32_chromaticity (colorimetry->primaries->g_y), + float_to_scaled_uint32_chromaticity (colorimetry->primaries->b_x), + float_to_scaled_uint32_chromaticity (colorimetry->primaries->b_y), + float_to_scaled_uint32_chromaticity (colorimetry->primaries->w_x), + float_to_scaled_uint32_chromaticity (colorimetry->primaries->w_y)); break; } @@ -414,23 +426,23 @@ send_information (struct wl_resource *info_resource, { case CLUTTER_EOTF_TYPE_NAMED: tf = clutter_tf_to_wayland (eotf->tf_name); - xx_image_description_info_v4_send_tf_named (info_resource, tf); + wp_image_description_info_v1_send_tf_named (info_resource, tf); break; case CLUTTER_EOTF_TYPE_GAMMA: if (G_APPROX_VALUE (eotf->gamma_exp, 2.2f, 0.0001f)) - xx_image_description_info_v4_send_tf_named (info_resource, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_GAMMA22); + wp_image_description_info_v1_send_tf_named (info_resource, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22); else if (G_APPROX_VALUE (eotf->gamma_exp, 2.8f, 0.0001f)) - xx_image_description_info_v4_send_tf_named (info_resource, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_GAMMA28); + wp_image_description_info_v1_send_tf_named (info_resource, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA28); else - xx_image_description_info_v4_send_tf_power (info_resource, + wp_image_description_info_v1_send_tf_power (info_resource, float_to_scaled_uint32 (eotf->gamma_exp)); break; } lum = clutter_color_state_params_get_luminance (color_state_params); - xx_image_description_info_v4_send_luminances (info_resource, + wp_image_description_info_v1_send_luminances (info_resource, float_to_scaled_uint32 (lum->min), (uint32_t) lum->max, (uint32_t) lum->ref); @@ -447,7 +459,7 @@ image_description_get_information (struct wl_client *client, if (image_desc->state != META_WAYLAND_IMAGE_DESCRIPTION_STATE_READY) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_V4_ERROR_NOT_READY, + WP_IMAGE_DESCRIPTION_V1_ERROR_NOT_READY, "The image description is not ready"); return; } @@ -455,7 +467,7 @@ image_description_get_information (struct wl_client *client, if (!image_desc->has_info) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_V4_ERROR_NO_INFORMATION, + WP_IMAGE_DESCRIPTION_V1_ERROR_NO_INFORMATION, "The image description has no information"); return; } @@ -464,17 +476,17 @@ image_description_get_information (struct wl_client *client, info_resource = wl_resource_create (client, - &xx_image_description_info_v4_interface, + &wp_image_description_info_v1_interface, wl_resource_get_version (resource), id); send_information (info_resource, image_desc->color_state); - xx_image_description_info_v4_send_done (info_resource); + wp_image_description_info_v1_send_done (info_resource); wl_resource_destroy (info_resource); } -static const struct xx_image_description_v4_interface +static const struct wp_image_description_v1_interface meta_wayland_image_description_interface = { image_description_destroy, @@ -527,7 +539,8 @@ update_preferred_color_state (MetaWaylandColorManagementSurface *cm_surface) { struct wl_resource *resource = l->data; - xx_color_management_feedback_surface_v4_send_preferred_changed (resource); + wp_color_management_surface_feedback_v1_send_preferred_changed (resource, + clutter_color_state_get_id (color_state)); } } @@ -670,9 +683,8 @@ color_management_surface_set_image_description (struct wl_client *client, if (!cm_surface) { - /* FIXME: the next version will have an ERROR_INERT */ wl_resource_post_error (resource, - XX_COLOR_MANAGEMENT_SURFACE_V4_ERROR_IMAGE_DESCRIPTION, + WP_COLOR_MANAGEMENT_SURFACE_V1_ERROR_INERT, "Underlying surface object has been destroyed"); return; } @@ -681,18 +693,18 @@ color_management_surface_set_image_description (struct wl_client *client, image_desc->state != META_WAYLAND_IMAGE_DESCRIPTION_STATE_READY) { wl_resource_post_error (resource, - XX_COLOR_MANAGEMENT_SURFACE_V4_ERROR_IMAGE_DESCRIPTION, + WP_COLOR_MANAGEMENT_SURFACE_V1_ERROR_IMAGE_DESCRIPTION, "Trying to set an image description which is not ready"); return; } switch (render_intent) { - case XX_COLOR_MANAGER_V4_RENDER_INTENT_PERCEPTUAL: + case WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL: break; default: wl_resource_post_error (resource, - XX_COLOR_MANAGEMENT_SURFACE_V4_ERROR_RENDER_INTENT, + WP_COLOR_MANAGEMENT_SURFACE_V1_ERROR_RENDER_INTENT, "Trying to use an unsupported rendering intent"); return; } @@ -709,9 +721,8 @@ color_management_surface_unset_image_description (struct wl_client *client, if (!cm_surface) { - /* FIXME: the next version will have an ERROR_INERT */ wl_resource_post_error (resource, - XX_COLOR_MANAGEMENT_SURFACE_V4_ERROR_IMAGE_DESCRIPTION, + WP_COLOR_MANAGEMENT_SURFACE_V1_ERROR_INERT, "Underlying surface object has been destroyed"); return; } @@ -719,7 +730,7 @@ color_management_surface_unset_image_description (struct wl_client *client, set_image_description (cm_surface, NULL); } -static const struct xx_color_management_surface_v4_interface +static const struct wp_color_management_surface_v1_interface meta_wayland_color_management_surface_interface = { color_management_surface_destroy, @@ -829,7 +840,7 @@ color_management_output_get_image_description (struct wl_client *client, image_desc_resource = wl_resource_create (client, - &xx_image_description_v4_interface, + &wp_image_description_v1_interface, wl_resource_get_version (resource), id); @@ -851,7 +862,7 @@ color_management_output_get_image_description (struct wl_client *client, image_desc = meta_wayland_image_description_new_failed (color_manager, image_desc_resource, - XX_IMAGE_DESCRIPTION_V4_CAUSE_NO_OUTPUT, + WP_IMAGE_DESCRIPTION_V1_CAUSE_NO_OUTPUT, "Underlying output object has been destroyed"); } @@ -861,7 +872,7 @@ color_management_output_get_image_description (struct wl_client *client, image_description_destructor); } -static const struct xx_color_management_output_v4_interface +static const struct wp_color_management_output_v1_interface meta_wayland_color_management_output_interface = { color_management_output_destroy, @@ -915,14 +926,14 @@ creator_params_create (struct wl_client *client, if (!creator_params->is_colorimetry_set || !creator_params->is_eotf_set) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INCOMPLETE_SET, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_INCOMPLETE_SET, "Not all required parameters were set"); return; } image_desc_resource = wl_resource_create (client, - &xx_image_description_v4_interface, + &wp_image_description_v1_interface, wl_resource_get_version (resource), id); @@ -958,7 +969,7 @@ creator_params_set_tf_named (struct wl_client *client, if (creator_params->is_eotf_set) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_ALREADY_SET, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_ALREADY_SET, "The transfer characteristics were already set"); return; } @@ -966,7 +977,7 @@ creator_params_set_tf_named (struct wl_client *client, if (!wayland_tf_to_clutter (tf, &eotf)) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INVALID_TF, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_INVALID_TF, "The named transfer function is not supported"); return; } @@ -986,7 +997,7 @@ creator_params_set_tf_power (struct wl_client *client, if (creator_params->is_eotf_set) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_ALREADY_SET, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_ALREADY_SET, "The transfer characteristics were already set"); return; } @@ -994,7 +1005,7 @@ creator_params_set_tf_power (struct wl_client *client, if (eexp < 10000 || eexp > 100000) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INVALID_TF, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_INVALID_TF, "The exponent must be between 1.0 and 10.0"); return; } @@ -1016,7 +1027,7 @@ creator_params_set_primaries_named (struct wl_client *client, if (creator_params->is_colorimetry_set) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_ALREADY_SET, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_ALREADY_SET, "The primaries were already set"); return; } @@ -1024,7 +1035,7 @@ creator_params_set_primaries_named (struct wl_client *client, if (!wayland_primaries_to_clutter (primaries, &colorimetry)) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INVALID_PRIMARIES, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_INVALID_PRIMARIES_NAMED, "The named primaries are not supported"); return; } @@ -1052,20 +1063,20 @@ creator_params_set_primaries (struct wl_client *client, if (creator_params->is_colorimetry_set) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_ALREADY_SET, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_ALREADY_SET, "The primaries were already set"); return; } primaries = g_new0 (ClutterPrimaries, 1); - primaries->r_x = scaled_uint32_to_float (r_x); - primaries->r_y = scaled_uint32_to_float (r_y); - primaries->g_x = scaled_uint32_to_float (g_x); - primaries->g_y = scaled_uint32_to_float (g_y); - primaries->b_x = scaled_uint32_to_float (b_x); - primaries->b_y = scaled_uint32_to_float (b_y); - primaries->w_x = scaled_uint32_to_float (w_x); - primaries->w_y = scaled_uint32_to_float (w_y); + primaries->r_x = scaled_uint32_to_float_chromaticity (r_x); + primaries->r_y = scaled_uint32_to_float_chromaticity (r_y); + primaries->g_x = scaled_uint32_to_float_chromaticity (g_x); + primaries->g_y = scaled_uint32_to_float_chromaticity (g_y); + primaries->b_x = scaled_uint32_to_float_chromaticity (b_x); + primaries->b_y = scaled_uint32_to_float_chromaticity (b_y); + primaries->w_x = scaled_uint32_to_float_chromaticity (w_x); + primaries->w_y = scaled_uint32_to_float_chromaticity (w_y); if (primaries->r_x < 0.0f || primaries->r_x > 1.0f || primaries->r_y < 0.0f || primaries->r_y > 1.0f || @@ -1099,7 +1110,7 @@ creator_params_set_luminance (struct wl_client *client, if (creator_params->is_luminance_set) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_ALREADY_SET, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_ALREADY_SET, "The luminance was already set"); return; } @@ -1108,18 +1119,18 @@ creator_params_set_luminance (struct wl_client *client, max = (float) max_lum; ref = (float) reference_lum; - if (max < ref) + if (max <= min) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INVALID_LUMINANCE, - "The maximum luminance is smaller than the reference luminance"); + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_INVALID_LUMINANCE, + "The maximum luminance is smaller than the minimum luminance"); return; } if (ref <= min) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INVALID_LUMINANCE, + WP_IMAGE_DESCRIPTION_CREATOR_PARAMS_V1_ERROR_INVALID_LUMINANCE, "The reference luminance is less or equal to the minimum luminance"); return; } @@ -1144,7 +1155,7 @@ creator_params_set_mastering_display_primaries (struct wl_client *client, int32_t w_y) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INVALID_MASTERING, + WP_COLOR_MANAGER_V1_ERROR_UNSUPPORTED_FEATURE, "Setting mastering display primaries is not supported"); } @@ -1155,7 +1166,7 @@ creator_params_set_mastering_luminance (struct wl_client *client, uint32_t max_lum) { wl_resource_post_error (resource, - XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_ERROR_INVALID_MASTERING, + WP_COLOR_MANAGER_V1_ERROR_UNSUPPORTED_FEATURE, "Setting mastering display luminances is not supported"); } @@ -1177,7 +1188,7 @@ creator_params_set_max_fall (struct wl_client *client, /* FIXME: technically we must send errors in some cases */ } -static const struct xx_image_description_creator_params_v4_interface +static const struct wp_image_description_creator_params_v1_interface meta_wayland_image_description_creator_params_interface = { creator_params_create, @@ -1220,7 +1231,7 @@ color_manager_get_output (struct wl_client *client, cm_output_resource = wl_resource_create (client, - &xx_color_management_output_v4_interface, + &wp_color_management_output_v1_interface, wl_resource_get_version (resource), id); @@ -1253,14 +1264,14 @@ color_manager_get_surface (struct wl_client *client, if (cm_surface->resource) { wl_resource_post_error (resource, - XX_COLOR_MANAGER_V4_ERROR_SURFACE_EXISTS, + WP_COLOR_MANAGER_V1_ERROR_SURFACE_EXISTS, "surface already requested"); return; } cm_surface->resource = wl_resource_create (client, - &xx_color_management_surface_v4_interface, + &wp_color_management_surface_v1_interface, wl_resource_get_version (resource), id); @@ -1271,14 +1282,14 @@ color_manager_get_surface (struct wl_client *client, } static void -color_management_feedback_surface_destroy (struct wl_client *client, +color_management_surface_feedback_destroy (struct wl_client *client, struct wl_resource *resource) { wl_resource_destroy (resource); } static void -color_management_feedback_surface_get_preferred (struct wl_client *client, +color_management_surface_feedback_get_preferred (struct wl_client *client, struct wl_resource *resource, uint32_t id) { @@ -1292,14 +1303,14 @@ color_management_feedback_surface_get_preferred (struct wl_client *client, if (!surface) { wl_resource_post_error (resource, - XX_COLOR_MANAGEMENT_FEEDBACK_SURFACE_V4_ERROR_INERT, + WP_COLOR_MANAGEMENT_SURFACE_FEEDBACK_V1_ERROR_INERT, "Underlying surface object has been destroyed"); return; } image_desc_resource = wl_resource_create (client, - &xx_image_description_v4_interface, + &wp_image_description_v1_interface, wl_resource_get_version (resource), id); @@ -1316,15 +1327,25 @@ color_management_feedback_surface_get_preferred (struct wl_client *client, image_description_destructor); } -static const struct xx_color_management_feedback_surface_v4_interface - meta_wayland_color_management_feedback_surface_interface = +static void +color_management_surface_feedback_get_preferred_parametric (struct wl_client *client, + struct wl_resource *resource, + uint32_t id) { - color_management_feedback_surface_destroy, - color_management_feedback_surface_get_preferred, + /* we currently only support parametric ones, so this is the same as get_preferred */ + color_management_surface_feedback_get_preferred (client, resource, id); +} + +static const struct wp_color_management_surface_feedback_v1_interface + meta_wayland_color_management_surface_feedback_interface = +{ + color_management_surface_feedback_destroy, + color_management_surface_feedback_get_preferred, + color_management_surface_feedback_get_preferred_parametric, }; static void -color_management_feedback_surface_destructor (struct wl_resource *resource) +color_management_surface_feedback_destructor (struct wl_resource *resource) { MetaWaylandColorManagementSurface *cm_surface = wl_resource_get_user_data (resource); @@ -1337,7 +1358,7 @@ color_management_feedback_surface_destructor (struct wl_resource *resource) } static void -color_manager_get_feedback_surface (struct wl_client *client, +color_manager_get_surface_feedback (struct wl_client *client, struct wl_resource *resource, uint32_t id, struct wl_resource *surface_resource) @@ -1345,42 +1366,42 @@ color_manager_get_feedback_surface (struct wl_client *client, MetaWaylandColorManager *color_manager = wl_resource_get_user_data (resource); MetaWaylandSurface *surface = wl_resource_get_user_data (surface_resource); MetaWaylandColorManagementSurface *cm_surface; - struct wl_resource *cm_feedback_surface_resource; + struct wl_resource *cm_surface_feedback_resource; cm_surface = ensure_color_management_surface (color_manager, surface); - cm_feedback_surface_resource = + cm_surface_feedback_resource = wl_resource_create (client, - &xx_color_management_feedback_surface_v4_interface, + &wp_color_management_surface_feedback_v1_interface, wl_resource_get_version (resource), id); - wl_resource_set_implementation (cm_feedback_surface_resource, - &meta_wayland_color_management_feedback_surface_interface, + wl_resource_set_implementation (cm_surface_feedback_resource, + &meta_wayland_color_management_surface_feedback_interface, cm_surface, - color_management_feedback_surface_destructor); + color_management_surface_feedback_destructor); cm_surface->feedback_resources = g_list_prepend (cm_surface->feedback_resources, - cm_feedback_surface_resource); + cm_surface_feedback_resource); update_preferred_color_state (cm_surface); } static void -color_manager_new_icc_creator (struct wl_client *client, - struct wl_resource *resource, - uint32_t id) +color_manager_create_icc_creator (struct wl_client *client, + struct wl_resource *resource, + uint32_t id) { wl_resource_post_error (resource, - XX_COLOR_MANAGER_V4_ERROR_UNSUPPORTED_FEATURE, + WP_COLOR_MANAGER_V1_ERROR_UNSUPPORTED_FEATURE, "ICC-based image description creator is unsupported"); } static void -color_manager_new_parametric_creator (struct wl_client *client, - struct wl_resource *resource, - uint32_t id) +color_manager_create_parametric_creator (struct wl_client *client, + struct wl_resource *resource, + uint32_t id) { MetaWaylandColorManager *color_manager = wl_resource_get_user_data (resource); MetaWaylandCreatorParams *creator_params; @@ -1388,7 +1409,7 @@ color_manager_new_parametric_creator (struct wl_client *client, creator_resource = wl_resource_create (client, - &xx_image_description_creator_params_v4_interface, + &wp_image_description_creator_params_v1_interface, wl_resource_get_version (resource), id); @@ -1402,45 +1423,57 @@ color_manager_new_parametric_creator (struct wl_client *client, } static void -color_manager_send_supported_events (struct wl_resource *resource) +color_manager_create_windows_scrgb (struct wl_client *client, + struct wl_resource *resource, + uint32_t id) { - xx_color_manager_v4_send_supported_intent (resource, - XX_COLOR_MANAGER_V4_RENDER_INTENT_PERCEPTUAL); - xx_color_manager_v4_send_supported_feature (resource, - XX_COLOR_MANAGER_V4_FEATURE_PARAMETRIC); - xx_color_manager_v4_send_supported_feature (resource, - XX_COLOR_MANAGER_V4_FEATURE_SET_PRIMARIES); - xx_color_manager_v4_send_supported_feature (resource, - XX_COLOR_MANAGER_V4_FEATURE_SET_TF_POWER); - xx_color_manager_v4_send_supported_feature (resource, - XX_COLOR_MANAGER_V4_FEATURE_SET_LUMINANCES); - xx_color_manager_v4_send_supported_tf_named (resource, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_GAMMA22); - xx_color_manager_v4_send_supported_tf_named (resource, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_GAMMA28); - xx_color_manager_v4_send_supported_tf_named (resource, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_SRGB); - xx_color_manager_v4_send_supported_tf_named (resource, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_ST2084_PQ); - xx_color_manager_v4_send_supported_tf_named (resource, - XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_BT709); - xx_color_manager_v4_send_supported_primaries_named (resource, - XX_COLOR_MANAGER_V4_PRIMARIES_SRGB); - xx_color_manager_v4_send_supported_primaries_named (resource, - XX_COLOR_MANAGER_V4_PRIMARIES_BT2020); - xx_color_manager_v4_send_supported_primaries_named (resource, - XX_COLOR_MANAGER_V4_PRIMARIES_NTSC); + wl_resource_post_error (resource, + WP_COLOR_MANAGER_V1_ERROR_UNSUPPORTED_FEATURE, + "Windows scRGB is not supported"); } -static const struct xx_color_manager_v4_interface +static void +color_manager_send_supported_events (struct wl_resource *resource) +{ + wp_color_manager_v1_send_supported_intent (resource, + WP_COLOR_MANAGER_V1_RENDER_INTENT_PERCEPTUAL); + wp_color_manager_v1_send_supported_feature (resource, + WP_COLOR_MANAGER_V1_FEATURE_PARAMETRIC); + wp_color_manager_v1_send_supported_feature (resource, + WP_COLOR_MANAGER_V1_FEATURE_SET_PRIMARIES); + wp_color_manager_v1_send_supported_feature (resource, + WP_COLOR_MANAGER_V1_FEATURE_SET_TF_POWER); + wp_color_manager_v1_send_supported_feature (resource, + WP_COLOR_MANAGER_V1_FEATURE_SET_LUMINANCES); + wp_color_manager_v1_send_supported_tf_named (resource, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA22); + wp_color_manager_v1_send_supported_tf_named (resource, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_GAMMA28); + wp_color_manager_v1_send_supported_tf_named (resource, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_SRGB); + wp_color_manager_v1_send_supported_tf_named (resource, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_ST2084_PQ); + wp_color_manager_v1_send_supported_tf_named (resource, + WP_COLOR_MANAGER_V1_TRANSFER_FUNCTION_BT1886); + wp_color_manager_v1_send_supported_primaries_named (resource, + WP_COLOR_MANAGER_V1_PRIMARIES_SRGB); + wp_color_manager_v1_send_supported_primaries_named (resource, + WP_COLOR_MANAGER_V1_PRIMARIES_BT2020); + wp_color_manager_v1_send_supported_primaries_named (resource, + WP_COLOR_MANAGER_V1_PRIMARIES_NTSC); + wp_color_manager_v1_send_done (resource); +} + +static const struct wp_color_manager_v1_interface meta_wayland_color_manager_interface = { color_manager_destroy, color_manager_get_output, color_manager_get_surface, - color_manager_get_feedback_surface, - color_manager_new_icc_creator, - color_manager_new_parametric_creator, + color_manager_get_surface_feedback, + color_manager_create_icc_creator, + color_manager_create_parametric_creator, + color_manager_create_windows_scrgb, }; static void @@ -1453,7 +1486,7 @@ color_management_bind (struct wl_client *client, struct wl_resource *resource; resource = wl_resource_create (client, - &xx_color_manager_v4_interface, + &wp_color_manager_v1_interface, version, id); @@ -1487,7 +1520,7 @@ update_output_color_state (MetaWaylandColorManager *color_manager, { struct wl_resource *resource = l->data; - xx_color_management_output_v4_send_image_description_changed (resource); + wp_color_management_output_v1_send_image_description_changed (resource); } } @@ -1573,8 +1606,8 @@ update_enabled (MetaWaylandColorManager *color_manager) { color_manager->global = wl_global_create (compositor->wayland_display, - &xx_color_manager_v4_interface, - META_XX_COLOR_MANAGEMENT_VERSION, + &wp_color_manager_v1_interface, + META_WP_COLOR_MANAGEMENT_VERSION, color_manager, color_management_bind); diff --git a/src/wayland/meta-wayland-versions.h b/src/wayland/meta-wayland-versions.h index 543857b38..b71befa39 100644 --- a/src/wayland/meta-wayland-versions.h +++ b/src/wayland/meta-wayland-versions.h @@ -57,7 +57,7 @@ #define META_WP_SINGLE_PIXEL_BUFFER_V1_VERSION 1 #define META_MUTTER_X11_INTEROP_VERSION 1 #define META_WP_FRACTIONAL_SCALE_VERSION 1 -#define META_XX_COLOR_MANAGEMENT_VERSION 1 +#define META_WP_COLOR_MANAGEMENT_VERSION 1 #define META_XDG_DIALOG_VERSION 1 #define META_WP_DRM_LEASE_DEVICE_V1_VERSION 1 #define META_XDG_SESSION_MANAGER_V1_VERSION 1 diff --git a/src/wayland/protocol/color-management-v1.xml b/src/wayland/protocol/color-management-v1.xml deleted file mode 100644 index 17f217cee..000000000 --- a/src/wayland/protocol/color-management-v1.xml +++ /dev/null @@ -1,1453 +0,0 @@ - - - - Copyright 2019 Sebastian Wick - Copyright 2019 Erwin Burema - Copyright 2020 AMD - Copyright 2020-2024 Collabora, Ltd. - Copyright 2024 Xaver Hugl - - Permission is hereby granted, free of charge, to any person obtaining a - copy of this software and associated documentation files (the "Software"), - to deal in the Software without restriction, including without limitation - the rights to use, copy, modify, merge, publish, distribute, sublicense, - and/or sell copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following conditions: - - The above copyright notice and this permission notice (including the next - paragraph) shall be included in all copies or substantial portions of the - Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - DEALINGS IN THE SOFTWARE. - - - - The aim of the color management extension is to allow clients to know - the color properties of outputs, and to tell the compositor about the color - properties of their content on surfaces. Doing this enables a compositor - to perform automatic color management of content for different outputs - according to how content is intended to look like. - - The color properties are represented as an image description object which - is immutable after it has been created. A wl_output always has an - associated image description that clients can observe. A wl_surface - always has an associated preferred image description as a hint chosen by - the compositor that clients can also observe. Clients can set an image - description on a wl_surface to denote the color characteristics of the - surface contents. - - An image description includes SDR and HDR colorimetry and encoding, HDR - metadata, and viewing environment parameters. An image description does - not include the properties set through color-representation extension. - It is expected that the color-representation extension is used in - conjunction with the color management extension when necessary, - particularly with the YUV family of pixel formats. - - Recommendation ITU-T H.273 - "Coding-independent code points for video signal type identification" - shall be referred to as simply H.273 here. - - The color-and-hdr repository - (https://gitlab.freedesktop.org/pq/color-and-hdr) contains - background information on the protocol design and legacy color management. - It also contains a glossary, learning resources for digital color, tools, - samples and more. - - The terminology used in this protocol is based on common color science and - color encoding terminology where possible. The glossary in the color-and-hdr - repository shall be the authority on the definition of terms in this - protocol. - - - - - A global interface used for getting color management extensions for - wl_surface and wl_output objects, and for creating client defined image - description objects. The extension interfaces allow - getting the image description of outputs and setting the image - description of surfaces. - - - - - Destroy the xx_color_manager_v4 object. This does not affect any other - objects in any way. - - - - - - - - - - - See the ICC.1:2022 specification from the International Color Consortium - for more details about rendering intents. - - The principles of ICC defined rendering intents apply with all types of - image descriptions, not only those with ICC file profiles. - - Compositors must support the perceptual rendering intent. Other - rendering intents are optional. - - - - - - - - - - - - - - - - - - - - The compositor supports set_mastering_display_primaries request with a - target color volume fully contained inside the primary color volume. - - - - - The compositor additionally supports target color volumes that - extend outside of the primary color volume. - - This can only be advertised if feature set_mastering_display_primaries - is supported as well. - - - - - - - Named color primaries used to encode well-known sets of primaries. H.273 - is the authority, when it comes to the exact values of primaries and - authoritative specifications, where an equivalent code point exists. - - Descriptions do list the specifications for convenience. - - - - - Color primaries as defined by - - Rec. ITU-R BT.709-6 - - Rec. ITU-R BT.1361-0 conventional colour gamut system and extended - colour gamut system (historical) - - IEC 61966-2-1 sRGB or sYCC - - IEC 61966-2-4 - - Society of Motion Picture and Television Engineers (SMPTE) RP 177 - (1993) Annex B - Equivalent to H.273 ColourPrimaries code point 1. - - - - - Color primaries as defined by - - Rec. ITU-R BT.470-6 System M (historical) - - United States National Television System Committee 1953 - Recommendation for transmission standards for color television - - United States Federal Communications Commission (2003) Title 47 Code - of Federal Regulations 73.682 (a)(20) - Equivalent to H.273 ColourPrimaries code point 4. - - - - - Color primaries as defined by - - Rec. ITU-R BT.470-6 System B, G (historical) - - Rec. ITU-R BT.601-7 625 - - Rec. ITU-R BT.1358-0 625 (historical) - - Rec. ITU-R BT.1700-0 625 PAL and 625 SECAM - Equivalent to H.273 ColourPrimaries code point 5. - - - - - Color primaries as defined by - - Rec. ITU-R BT.601-7 525 - - Rec. ITU-R BT.1358-1 525 or 625 (historical) - - Rec. ITU-R BT.1700-0 NTSC - - SMPTE 170M (2004) - - SMPTE 240M (1999) (historical) - Equivalent to H.273 ColourPrimaries code point 6 and 7. - - - - - Color primaries as defined by H.273 for generic film. - Equivalent to H.273 ColourPrimaries code point 8. - - - - - Color primaries as defined by - - Rec. ITU-R BT.2020-2 - - Rec. ITU-R BT.2100-0 - Equivalent to H.273 ColourPrimaries code point 9. - - - - - Color primaries as defined as the maximum of the CIE 1931 XYZ color - space by - - SMPTE ST 428-1 - - (CIE 1931 XYZ as in ISO 11664-1) - Equivalent to H.273 ColourPrimaries code point 10. - - - - - Color primaries as defined by Digital Cinema System and published in - SMPTE RP 431-2 (2011). Equivalent to H.273 ColourPrimaries code point - 11. - - - - - Color primaries as defined by Digital Cinema System and published in - SMPTE EG 432-1 (2010). - Equivalent to H.273 ColourPrimaries code point 12. - - - - - Color primaries as defined by Adobe as "Adobe RGB" and later published - by ISO 12640-4 (2011). - - - - - - - Named transfer functions used to encode well-known transfer - characteristics. H.273 is the authority, when it comes to the exact - formulas and authoritative specifications, where an equivalent code - point exists. - - Descriptions do list the specifications for convenience. - - - - - Transfer characteristics as defined by - - Rec. ITU-R BT.709-6 - - Rec. ITU-R BT.1361-0 conventional colour gamut system (historical) - Equivalent to H.273 TransferCharacteristics code point 1, 6, 14, 15. - - - - - Transfer characteristics as defined by - - Rec. ITU-R BT.470-6 System M (historical) - - United States National Television System Committee 1953 - Recommendation for transmission standards for color television - - United States Federal Communications Commission (2003) Title 47 Code - of Federal Regulations 73.682 (a) (20) - - Rec. ITU-R BT.1700-0 625 PAL and 625 SECAM - Equivalent to H.273 TransferCharacteristics code point 4. - - - - - Transfer characteristics as defined by - - Rec. ITU-R BT.470-6 System B, G (historical) - Equivalent to H.273 TransferCharacteristics code point 5. - - - - - Transfer characteristics as defined by - - SMPTE ST 240 (1999) - Equivalent to H.273 TransferCharacteristics code point 7. - - - - - Linear transfer characteristics. - Equivalent to H.273 TransferCharacteristics code point 8. - - - - - Logarithmic transfer characteristic (100:1 range). - Equivalent to H.273 TransferCharacteristics code point 9. - - - - - Logarithmic transfer characteristic (100 * Sqrt(10) : 1 range). - Equivalent to H.273 TransferCharacteristics code point 10. - - - - - Transfer characteristics as defined by - - IEC 61966-2-4 - Equivalent to H.273 TransferCharacteristics code point 11. - - - - - Transfer characteristics as defined by - - Rec. ITU-R BT.1361-0 extended colour gamut system (historical) - Equivalent to H.273 TransferCharacteristics code point 12. - - - - - Transfer characteristics as defined by - - IEC 61966-2-1 sRGB - Equivalent to H.273 TransferCharacteristics code point 13 with - MatrixCoefficients set to 0. - - - - - Transfer characteristics as defined by - - IEC 61966-2-1 sYCC - Equivalent to H.273 TransferCharacteristics code point 13 with - MatrixCoefficients set to anything but 0. - - - - - Transfer characteristics as defined by - - SMPTE ST 2084 (2014) for 10-, 12-, 14- and 16-bit systems - - Rec. ITU-R BT.2100-2 perceptual quantization (PQ) system - Equivalent to H.273 TransferCharacteristics code point 16. - - This TF implies these default luminances - - primary color volume minimum: 0.005 cd/m² - - primary color volume maximum: 10000 cd/m² - - reference white: 203 cd/m² - - - - - Transfer characteristics as defined by - - SMPTE ST 428-1 (2019) - Equivalent to H.273 TransferCharacteristics code point 17. - - - - - Transfer characteristics as defined by - - ARIB STD-B67 (2015) - - Rec. ITU-R BT.2100-2 hybrid log-gamma (HLG) system - Equivalent to H.273 TransferCharacteristics code point 18. - - This TF implies these default luminances - - primary color volume minimum: 0.005 cd/m² - - primary color volume maximum: 1000 cd/m² - - reference white: 203 cd/m² - Note: HLG is a scene referred signal. All absolute luminance values - used here for HLG assume a 1000 cd/m² display. - - - - - - - This creates a new xx_color_management_output_v4 object for the - given wl_output. - - See the xx_color_management_output_v4 interface for more details. - - - - - - - - - If a xx_color_management_surface_v4 object already exists for the given - wl_surface, the protocol error surface_exists is raised. - - This creates a new color xx_color_management_surface_v4 object for the - given wl_surface. - - See the xx_color_management_surface_v4 interface for more details. - - - - - - - - - This creates a new color xx_color_management_feedback_surface_v4 object - for the given wl_surface. - - See the xx_color_management_feedback_surface_v4 interface for more - details. - - - - - - - - - Makes a new ICC-based image description creator object with all - properties initially unset. The client can then use the object's - interface to define all the required properties for an image description - and finally create a xx_image_description_v4 object. - - This request can be used when the compositor advertises - xx_color_manager_v4.feature.icc_v2_v4. - Otherwise this request raises the protocol error unsupported_feature. - - - - - - - - Makes a new parametric image description creator object with all - properties initially unset. The client can then use the object's - interface to define all the required properties for an image description - and finally create a xx_image_description_v4 object. - - This request can be used when the compositor advertises - xx_color_manager_v4.feature.parametric. - Otherwise this request raises the protocol error unsupported_feature. - - - - - - - - When this object is created, it shall immediately send this event once - for each rendering intent the compositor supports. - - - - - - - - When this object is created, it shall immediately send this event once - for each compositor supported feature listed in the enumeration. - - - - - - - - When this object is created, it shall immediately send this event once - for each named transfer function the compositor supports with the - parametric image description creator. - - - - - - - - When this object is created, it shall immediately send this event once - for each named set of primaries the compositor supports with the - parametric image description creator. - - - - - - - - - A xx_color_management_output_v4 describes the color properties of an - output. - - The xx_color_management_output_v4 is associated with the wl_output global - underlying the wl_output object. Therefore the client destroying the - wl_output object has no impact, but the compositor removing the output - global makes the xx_color_management_output_v4 object inert. - - - - - Destroy the color xx_color_management_output_v4 object. This does not - affect any remaining protocol objects. - - - - - - This event is sent whenever the image description of the output changed, - followed by one wl_output.done event common to output events across all - extensions. - - If the client wants to use the updated image description, it needs to do - get_image_description again, because image description objects are - immutable. - - - - - - This creates a new xx_image_description_v4 object for the current image - description of the output. There always is exactly one image description - active for an output so the client should destroy the image description - created by earlier invocations of this request. This request is usually - sent as a reaction to the image_description_changed event or when - creating a xx_color_management_output_v4 object. - - The image description of an output represents the color encoding the - output expects. There might be performance and power advantages, as well - as improved color reproduction, if a content update matches the image - description of the output it is being shown on. If a content update is - shown on any other output than the one it matches the image description - of, then the color reproduction on those outputs might be considerably - worse. - - The created xx_image_description_v4 object preserves the image - description of the output from the time the object was created. - - The resulting image description object allows get_information request. - - If this protocol object is inert, the resulting image description object - shall immediately deliver the xx_image_description_v4.failed event with - the no_output cause. - - If the interface version is inadequate for the output's image - description, meaning that the client does not support all the events - needed to deliver the crucial information, the resulting image - description object shall immediately deliver the - xx_image_description_v4.failed event with the low_version cause. - - Otherwise the object shall immediately deliver the ready event. - - - - - - - - - A xx_color_management_surface_v4 allows the client to set the color - space and HDR properties of a surface. - - If the wl_surface associated with the xx_color_management_surface_v4 is - destroyed, the xx_color_management_surface_v4 object becomes inert. - - - - - Destroy the xx_color_management_surface_v4 object and do the same as - unset_image_description. - - - - - - - - - - - - Set the image description of the underlying surface. The image - description and rendering intent are double-buffered state, see - wl_surface.commit. - - It is the client's responsibility to understand the image description - it sets on a surface, and to provide content that matches that image - description. Compositors might convert images to match their own or any - other image descriptions. - - Image description whose creation gracefully failed (received - xx_image_description_v4.failed) are forbidden in this request, and in - such case the protocol error image_description is raised. - - All image descriptions whose creation succeeded (received - xx_image_description_v4.ready) are allowed and must always be accepted - by the compositor. - - A rendering intent provides the client's preference on how content - colors should be mapped to each output. The render_intent value must - be one advertised by the compositor with - xx_color_manager_v4.render_intent event, otherwise the protocol error - render_intent is raised. - - By default, a surface does not have an associated image description - nor a rendering intent. The handling of color on such surfaces is - compositor implementation defined. Compositors should handle such - surfaces as sRGB but may handle them differently if they have specific - requirements. - - - - - - - - - This request removes any image description from the surface. See - set_image_description for how a compositor handles a surface without - an image description. This is double-buffered state, see - wl_surface.commit. - - - - - - - A xx_color_management_feedback_surface_v4 allows the client to get the - preferred color description of a surface. - - If the wl_surface associated with this object is destroyed, the - xx_color_management_feedback_surface_v4 object becomes inert. - - - - - Destroy the xx_color_management_feedback_surface_v4 object. - - - - - - - - - - - The preferred image description is the one which likely has the most - performance and/or quality benefits for the compositor if used by the - client for its wl_surface contents. This event is sent whenever the - compositor changes the wl_surface's preferred image description. - - This event is merely a notification. When the client wants to know - what the preferred image description is, it shall use the get_preferred - request. - - The preferred image description is not automatically used for anything. - It is only a hint, and clients may set any valid image description with - set_image_description but there might be performance and color accuracy - improvements by providing the wl_surface contents in the preferred - image description. Therefore clients that can, should render according - to the preferred image description - - - - - - If this protocol object is inert, the protocol error inert is raised. - - The preferred image description represents the compositor's preferred - color encoding for this wl_surface at the current time. There might be - performance and power advantages, as well as improved color - reproduction, if the image description of a content update matches the - preferred image description. - - This creates a new xx_image_description_v4 object for the currently - preferred image description for the wl_surface. The client should - stop using and destroy the image descriptions created by earlier - invocations of this request for the associated wl_surface. - This request is usually sent as a reaction to the preferred_changed - event or when creating a xx_color_management_feedback_surface_v4 object - if the client is capable of adapting to image descriptions. - - The created xx_image_description_v4 object preserves the preferred image - description of the wl_surface from the time the object was created. - - The resulting image description object allows get_information request. - - If the interface version is inadequate for the preferred image - description, meaning that the client does not support all the - events needed to deliver the crucial information, the resulting image - description object shall immediately deliver the - xx_image_description_v4.failed event with the low_version cause, - otherwise the object shall immediately deliver the ready event. - - - - - - - - - This type of object is used for collecting all the information required - to create a xx_image_description_v4 object from an ICC file. A complete - set of required parameters consists of these properties: - - ICC file - - Each required property must be set exactly once if the client is to create - an image description. The set requests verify that a property was not - already set. The create request verifies that all required properties are - set. There may be several alternative requests for setting each property, - and in that case the client must choose one of them. - - Once all properties have been set, the create request must be used to - create the image description object, destroying the creator in the - process. - - - - - - - - - - - - - - - Create an image description object based on the ICC information - previously set on this object. A compositor must parse the ICC data in - some undefined but finite amount of time. - - The completeness of the parameter set is verified. If the set is not - complete, the protocol error incomplete_set is raised. For the - definition of a complete set, see the description of this interface. - - If the particular combination of the information is not supported - by the compositor, the resulting image description object shall - immediately deliver the xx_image_description_v4.failed event with the - 'unsupported' cause. If a valid image description was created from the - information, the xx_image_description_v4.ready event will eventually - be sent instead. - - This request destroys the xx_image_description_creator_icc_v4 object. - - The resulting image description object does not allow get_information - request. - - - - - - - - Sets the ICC profile file to be used as the basis of the image - description. - - The data shall be found through the given fd at the given offset, having - the given length. The fd must seekable and readable. Violating these - requirements raises the bad_fd protocol error. - - If reading the data fails due to an error independent of the client, the - compositor shall send the xx_image_description_v4.failed event on the - created xx_image_description_v4 with the 'operating_system' cause. - - The maximum size of the ICC profile is 4 MB. If length is greater than - that or zero, the protocol error bad_size is raised. If offset + length - exceeds the file size, the protocol error out_of_file is raised. - - A compositor may read the file at any time starting from this request - and only until whichever happens first: - - If create request was issued, the xx_image_description_v4 object - delivers either failed or ready event; or - - if create request was not issued, this - xx_image_description_creator_icc_v4 object is destroyed. - - A compositor shall not modify the contents of the file, and the fd may - be sealed for writes and size changes. The client must ensure to its - best ability that the data does not change while the compositor is - reading it. - - The data must represent a valid ICC profile. The ICC profile version - must be 2 or 4, it must be a 3 channel profile and the class must be - Display or ColorSpace. Violating these requirements will not result in a - protocol error but will eventually send the - xx_image_description_v4.failed event on the created - xx_image_description_v4 with the 'unsupported' cause. - - See the International Color Consortium specification ICC.1:2022 for more - details about ICC profiles. - - If ICC file has already been set on this object, the protocol error - already_set is raised. - - - - - - - - - - - This type of object is used for collecting all the parameters required - to create a xx_image_description_v4 object. A complete set of required - parameters consists of these properties: - - transfer characteristic function (tf) - - chromaticities of primaries and white point (primary color volume) - - The following properties are optional and have a well-defined default - if not explicitly set: - - primary color volume luminance range - - reference white luminance level - - mastering display primaries and white point (target color volume) - - mastering luminance range - - maximum content light level - - maximum frame-average light level - - Each required property must be set exactly once if the client is to create - an image description. The set requests verify that a property was not - already set. The create request verifies that all required properties are - set. There may be several alternative requests for setting each property, - and in that case the client must choose one of them. - - Once all properties have been set, the create request must be used to - create the image description object, destroying the creator in the - process. - - - - - - - - - - - - - - - - - - Create an image description object based on the parameters previously - set on this object. - - The completeness of the parameter set is verified. If the set is not - complete, the protocol error incomplete_set is raised. For the - definition of a complete set, see the description of this interface. - - Also, the combination of the parameter set is verified. If the set is - not consistent, the protocol error inconsistent_set is raised. - - If the particular combination of the parameter set is not supported - by the compositor, the resulting image description object shall - immediately deliver the xx_image_description_v4.failed event with the - 'unsupported' cause. If a valid image description was created from the - parameter set, the xx_image_description_v4.ready event will eventually - be sent instead. - - This request destroys the xx_image_description_creator_params_v4 - object. - - The resulting image description object does not allow get_information - request. - - - - - - - - Sets the transfer characteristic using explicitly enumerated named - functions. - - When the resulting image description is attached to an image, the - content should be encoded and decoded according to the industry standard - practices for the transfer characteristic. - - Only names advertised with xx_color_manager_v4 event supported_tf_named - are allowed. Other values shall raise the protocol error invalid_tf. - - If transfer characteristic has already been set on this object, the - protocol error already_set is raised. - - - - - - - - Sets the color component transfer characteristic to a power curve with - the given exponent. This curve represents the conversion from electrical - to optical pixel or color values. - - When the resulting image description is attached to an image, the - content should be encoded with the inverse of the power curve. - - The curve exponent shall be multiplied by 10000 to get the argument eexp - value to carry the precision of 4 decimals. - - The curve exponent must be at least 1.0 and at most 10.0. Otherwise the - protocol error invalid_tf is raised. - - If transfer characteristic has already been set on this object, the - protocol error already_set is raised. - - This request can be used when the compositor advertises - xx_color_manager_v4.feature.set_tf_power. Otherwise this request raises - the protocol error unsupported_feature. - - - - - - - - Sets the color primaries and white point using explicitly named sets. - This describes the primary color volume which is the basis for color - value encoding. - - Only names advertised with xx_color_manager_v4 event - supported_primaries_named are allowed. Other values shall raise the - protocol error invalid_primaries. - - If primaries have already been set on this object, the protocol error - already_set is raised. - - - - - - - - Sets the color primaries and white point using CIE 1931 xy chromaticity - coordinates. This describes the primary color volume which is the basis - for color value encoding. - - Each coordinate value is multiplied by 10000 to get the argument value - to carry precision of 4 decimals. - - If primaries have already been set on this object, the protocol error - already_set is raised. - - This request can be used if the compositor advertises - xx_color_manager_v4.feature.set_primaries. Otherwise this request raises - the protocol error unsupported_feature. - - - - - - - - - - - - - - - Sets the primary color volume luminance range and the reference white - luminance level. - - The default luminances are - - primary color volume minimum: 0.2 cd/m² - - primary color volume maximum: 80 cd/m² - - reference white: 80 cd/m² - - Setting a named transfer characteristic can imply other default - luminances. - - The default luminances get overwritten when this request is used. - - 'min_lum' and 'max_lum' specify the minimum and maximum luminances of - the primary color volume as reproduced by the targeted display. - - 'reference_lum' specifies the luminance of the reference white as - reproduced by the targeted display, and reflects the targeted viewing - environment. - - Compositors should make sure that all content is anchored, meaning that - an input signal level of 'reference_lum' on one image description and - another input signal level of 'reference_lum' on another image - description should produce the same output level, even though the - 'reference_lum' on both image representations can be different. - - If 'max_lum' is less than the 'reference_lum', or 'reference_lum' is - less than or equal to 'min_lum', the protocol error invalid_luminance is - raised. - - The minimum luminance is multiplied by 10000 to get the argument - 'min_lum' value and carries precision of 4 decimals. The maximum - luminance and reference white luminance values are unscaled. - - If the primary color volume luminance range and the reference white - luminance level have already been set on this object, the protocol error - already_set is raised. - - This request can be used if the compositor advertises - xx_color_manager_v4.feature.set_luminances. Otherwise this request - raises the protocol error unsupported_feature. - - - - - - - - - - Provides the color primaries and white point of the mastering display - using CIE 1931 xy chromaticity coordinates. This is compatible with the - SMPTE ST 2086 definition of HDR static metadata. - - The mastering display primaries define the target color volume. - - If mastering display primaries are not explicitly set, the target color - volume is assumed to be equal to the primary color volume. - - The target color volume is defined by all tristimulus values between 0.0 - and 1.0 (inclusive) of the color space defined by the given mastering - display primaries and white point. The colorimetry is identical between - the container color space and the mastering display color space, - including that no chromatic adaptation is applied even if the white - points differ. - - The target color volume can exceed the primary color volume to allow for - a greater color volume with an existing color space definition (for - example scRGB). It can be smaller than the primary color volume to - minimize gamut and tone mapping distances for big color spaces (HDR - metadata). - - To make use of the entire target color volume a suitable pixel format - has to be chosen (e.g. floating point to exceed the primary color - volume, or abusing limited quantization range as with xvYCC). - - Each coordinate value is multiplied by 10000 to get the argument value - to carry precision of 4 decimals. - - If mastering display primaries have already been set on this object, the - protocol error already_set is raised. - - This request can be used if the compositor advertises - xx_color_manager_v4.feature.set_mastering_display_primaries. Otherwise - this request raises the protocol error unsupported_feature. The - advertisement implies support only for target color volumes fully - contained within the primary color volume. - - If a compositor additionally supports target color volume exceeding the - primary color volume, it must advertise - xx_color_manager_v4.feature.extended_target_volume. If a client uses - target color volume exceeding the primary color volume and the - compositor does not support it, the result is implementation defined. - Compositors are recommended to detect this case and fail the image - description gracefully, but it may as well result in color artifacts. - - - - - - - - - - - - - - - Sets the luminance range that was used during the content mastering - process as the minimum and maximum absolute luminance L. This is - compatible with the SMPTE ST 2086 definition of HDR static metadata. - - The mastering luminance range is undefined by default. - - If max L is less than or equal to min L, the protocol error - invalid_luminance is raised. - - Min L value is multiplied by 10000 to get the argument min_lum value - and carry precision of 4 decimals. Max L value is unscaled for max_lum. - - - - - - - - - Sets the maximum content light level (max_cll) as defined by CTA-861-H. - - This can only be set when set_tf_cicp is used to set the transfer - characteristic to Rec. ITU-R BT.2100-2 perceptual quantization system. - Otherwise, 'create' request shall raise inconsistent_set protocol - error. - - max_cll is undefined by default. - - - - - - - - Sets the maximum frame-average light level (max_fall) as defined by - CTA-861-H. - - This can only be set when set_tf_cicp is used to set the transfer - characteristic to Rec. ITU-R BT.2100-2 perceptual quantization system. - Otherwise, 'create' request shall raise inconsistent_set protocol error. - - max_fall is undefined by default. - - - - - - - - - An image description carries information about the color encoding used on - a surface when attached to a wl_surface via - xx_color_management_surface_v4.set_image_description. A compositor can use - this information to decode pixel values into colorimetrically meaningful - quantities. - - Note, that the xx_image_description_v4 object is not ready to be used - immediately after creation. The object eventually delivers either the - 'ready' or the 'failed' event, specified in all requests creating it. The - object is deemed "ready" after receiving the 'ready' event. - - An object which is not ready is illegal to use, it can only be destroyed. - Any other request in this interface shall result in the 'not_ready' - protocol error. Attempts to use an object which is not ready through other - interfaces shall raise protocol errors defined there. - - Once created and regardless of how it was created, a - xx_image_description_v4 object always refers to one fixed image - description. It cannot change after creation. - - - - - Destroy this object. It is safe to destroy an object which is not ready. - - Destroying a xx_image_description_v4 object has no side-effects, not - even if a xx_color_management_surface_v4.set_image_description has not - yet been followed by a wl_surface.commit. - - - - - - - - - - - - - - - - - - - - - - If creating a xx_image_description_v4 object fails for a reason that is - not defined as a protocol error, this event is sent. - - The requests that create image description objects define whether and - when this can occur. Only such creation requests can trigger this event. - This event cannot be triggered after the image description was - successfully formed. - - Once this event has been sent, the xx_image_description_v4 object will - never become ready and it can only be destroyed. - - - - - - - - - Once this event has been sent, the xx_image_description_v4 object is - deemed "ready". Ready objects can be used to send requests and can be - used through other interfaces. - - Every ready xx_image_description_v4 protocol object refers to an - underlying image description record in the compositor. Multiple protocol - objects may end up referring to the same record. Clients may identify - these "copies" by comparing their id numbers: if the numbers from two - protocol objects are identical, the protocol objects refer to the same - image description record. Two different image description records - cannot have the same id number simultaneously. The id number does not - change during the lifetime of the image description record. - - The id number is valid only as long as the protocol object is alive. If - all protocol objects referring to the same image description record are - destroyed, the id number may be recycled for a different image - description record. - - Image description id number is not a protocol object id. Zero is - reserved as an invalid id number. It shall not be possible for a client - to refer to an image description by its id number in protocol. The id - numbers might not be portable between Wayland connections. - - This identity allows clients to de-duplicate image description records - and avoid get_information request if they already have the image - description information. - - - - - - - - Creates a xx_image_description_info_v4 object which delivers the - information that makes up the image description. - - Not all image description protocol objects allow get_information - request. Whether it is allowed or not is defined by the request that - created the object. If get_information is not allowed, the protocol - error no_information is raised. - - - - - - - - - Sends all matching events describing an image description object exactly - once and finally sends the 'done' event. - - Once a xx_image_description_info_v4 object has delivered a 'done' event it - is automatically destroyed. - - Every xx_image_description_info_v4 created from the same - xx_image_description_v4 shall always return the exact same data. - - - - - Signals the end of information events and destroys the object. - - - - - - The icc argument provides a file descriptor to the client which may be - memory-mapped to provide the ICC profile matching the image description. - The fd is read-only, and if mapped then it must be mapped with - MAP_PRIVATE by the client. - - The ICC profile version and other details are determined by the - compositor. There is no provision for a client to ask for a specific - kind of a profile. - - - - - - - - - - Delivers the primary color volume primaries and white point using CIE - 1931 xy chromaticity coordinates. - - Each coordinate value is multiplied by 10000 to get the argument value - to carry precision of 4 decimals. - - - - - - - - - - - - - - - Delivers the primary color volume primaries and white point using an - explicitly enumerated named set. - - - - - - - - The color component transfer characteristic of this image description is - a pure power curve. This event provides the exponent of the power - function. This curve represents the conversion from electrical to - optical pixel or color values. - - The curve exponent has been multiplied by 10000 to get the argument eexp - value to carry the precision of 4 decimals. - - - - - - - - Delivers the transfer characteristic using an explicitly enumerated - named function. - - - - - - - - Delivers the primary color volume luminance range and the reference - white luminance level. - - The minimum luminance is multiplied by 10000 to get the argument - 'min_lum' value and carries precision of 4 decimals. The maximum - luminance and reference white luminance values are unscaled. - - - - - - - - - - Provides the color primaries and white point of the target color volume - using CIE 1931 xy chromaticity coordinates. This is compatible with the - SMPTE ST 2086 definition of HDR static metadata for mastering displays. - - While primary color volume is about how color is encoded, the target - color volume is the actually displayable color volume. If target color - volume is equal to the primary color volume, then this event is not - sent. - - Each coordinate value is multiplied by 10000 to get the argument value - to carry precision of 4 decimals. - - - - - - - - - - - - - - - Provides the luminance range that the image description is targeting as - the minimum and maximum absolute luminance L. This is compatible with - the SMPTE ST 2086 definition of HDR static metadata. - - This luminance range is only theoretical and may not correspond to the - luminance of light emitted on an actual display. - - Min L value is multiplied by 10000 to get the argument min_lum value and - carry precision of 4 decimals. Max L value is unscaled for max_lum. - - - - - - - - - Provides the targeted max_cll of the image description. max_cll is - defined by CTA-861-H. - - This luminance is only theoretical and may not correspond to the - luminance of light emitted on an actual display. - - - - - - - - Provides the targeted max_fall of the image description. max_fall is - defined by CTA-861-H. - - This luminance is only theoretical and may not correspond to the - luminance of light emitted on an actual display. - - - - - -