From 3b53f7cb6cb1c1aa5ef820440314ae3aaa70ea9a Mon Sep 17 00:00:00 2001 From: Joan Torres Date: Fri, 20 Sep 2024 17:42:57 +0200 Subject: [PATCH] clutter/color-state: Drop using default colorspace and default tf Use the defaults explicitliy, which is SRGB for both. Part-of: --- clutter/clutter/clutter-color-manager.c | 4 ++-- clutter/clutter/clutter-color-state.c | 12 +----------- clutter/clutter/clutter-color-state.h | 2 -- src/backends/meta-color-device.c | 10 +++++----- src/tests/clutter/conform/actor-color-state.c | 6 +++--- src/wayland/meta-wayland-color-management.c | 4 +--- 6 files changed, 12 insertions(+), 26 deletions(-) diff --git a/clutter/clutter/clutter-color-manager.c b/clutter/clutter/clutter-color-manager.c index 99c7e7418..26518fdb0 100644 --- a/clutter/clutter/clutter-color-manager.c +++ b/clutter/clutter/clutter-color-manager.c @@ -148,8 +148,8 @@ clutter_color_manager_get_default_color_state (ClutterColorManager *color_manage { color_manager->default_color_state = clutter_color_state_new (color_manager->context, - CLUTTER_COLORSPACE_DEFAULT, - CLUTTER_TRANSFER_FUNCTION_DEFAULT); + CLUTTER_COLORSPACE_SRGB, + CLUTTER_TRANSFER_FUNCTION_SRGB); } return color_manager->default_color_state; diff --git a/clutter/clutter/clutter-color-state.c b/clutter/clutter/clutter-color-state.c index c74bb8610..f52b227cf 100644 --- a/clutter/clutter/clutter-color-state.c +++ b/clutter/clutter/clutter-color-state.c @@ -116,8 +116,6 @@ clutter_colorspace_to_string (ClutterColorspace colorspace) { switch (colorspace) { - case CLUTTER_COLORSPACE_DEFAULT: - return "unknown"; case CLUTTER_COLORSPACE_SRGB: return "sRGB"; case CLUTTER_COLORSPACE_BT2020: @@ -132,8 +130,6 @@ clutter_eotf_to_string (ClutterEOTF eotf) { switch (eotf.tf_name) { - case CLUTTER_TRANSFER_FUNCTION_DEFAULT: - return "default"; case CLUTTER_TRANSFER_FUNCTION_SRGB: return "sRGB"; case CLUTTER_TRANSFER_FUNCTION_PQ: @@ -200,7 +196,6 @@ clutter_eotf_get_default_luminance (ClutterEOTF eotf) { switch (eotf.tf_name) { - case CLUTTER_TRANSFER_FUNCTION_DEFAULT: case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_LINEAR: return &sdr_default_luminance; @@ -479,7 +474,6 @@ get_eotf (ClutterColorState *color_state) case CLUTTER_TRANSFER_FUNCTION_PQ: return &pq_eotf; case CLUTTER_TRANSFER_FUNCTION_SRGB: - case CLUTTER_TRANSFER_FUNCTION_DEFAULT: return &srgb_eotf; case CLUTTER_TRANSFER_FUNCTION_LINEAR: return NULL; @@ -501,7 +495,6 @@ get_inv_eotf (ClutterColorState *color_state) case CLUTTER_TRANSFER_FUNCTION_PQ: return &pq_inv_eotf; case CLUTTER_TRANSFER_FUNCTION_SRGB: - case CLUTTER_TRANSFER_FUNCTION_DEFAULT: return &srgb_inv_eotf; case CLUTTER_TRANSFER_FUNCTION_LINEAR: return NULL; @@ -555,7 +548,6 @@ get_primaries (ClutterColorState *color_state) case CLUTTER_COLORIMETRY_TYPE_COLORSPACE: switch (priv->colorimetry.colorspace) { - case CLUTTER_COLORSPACE_DEFAULT: case CLUTTER_COLORSPACE_SRGB: return &srgb_primaries; case CLUTTER_COLORSPACE_BT2020: @@ -1153,7 +1145,6 @@ clutter_color_state_required_format (ClutterColorState *color_state) case CLUTTER_TRANSFER_FUNCTION_PQ: return CLUTTER_ENCODING_REQUIRED_FORMAT_UINT10; case CLUTTER_TRANSFER_FUNCTION_SRGB: - case CLUTTER_TRANSFER_FUNCTION_DEFAULT: return CLUTTER_ENCODING_REQUIRED_FORMAT_UINT8; } @@ -1198,7 +1189,6 @@ clutter_color_state_get_blending (ClutterColorState *color_state, break; /* effectively this means we will blend sRGB content in sRGB, not linear */ case CLUTTER_TRANSFER_FUNCTION_SRGB: - case CLUTTER_TRANSFER_FUNCTION_DEFAULT: blending_tf = priv->eotf.tf_name; break; default: @@ -1218,7 +1208,7 @@ clutter_color_state_get_blending (ClutterColorState *color_state, primaries = NULL; break; case CLUTTER_COLORIMETRY_TYPE_PRIMARIES: - colorspace = CLUTTER_COLORSPACE_DEFAULT; + colorspace = CLUTTER_COLORSPACE_SRGB; primaries = priv->colorimetry.primaries; break; } diff --git a/clutter/clutter/clutter-color-state.h b/clutter/clutter/clutter-color-state.h index 10581b3ea..b5ced5eea 100644 --- a/clutter/clutter/clutter-color-state.h +++ b/clutter/clutter/clutter-color-state.h @@ -34,14 +34,12 @@ G_BEGIN_DECLS typedef enum { - CLUTTER_COLORSPACE_DEFAULT, CLUTTER_COLORSPACE_SRGB, CLUTTER_COLORSPACE_BT2020, } ClutterColorspace; typedef enum { - CLUTTER_TRANSFER_FUNCTION_DEFAULT, CLUTTER_TRANSFER_FUNCTION_SRGB, CLUTTER_TRANSFER_FUNCTION_PQ, CLUTTER_TRANSFER_FUNCTION_LINEAR, diff --git a/src/backends/meta-color-device.c b/src/backends/meta-color-device.c index 1c853a152..5918fbe71 100644 --- a/src/backends/meta-color-device.c +++ b/src/backends/meta-color-device.c @@ -632,7 +632,7 @@ get_color_space_from_monitor (MetaMonitor *monitor) { case META_OUTPUT_COLORSPACE_DEFAULT: case META_OUTPUT_COLORSPACE_UNKNOWN: - return CLUTTER_COLORSPACE_DEFAULT; + return CLUTTER_COLORSPACE_SRGB; case META_OUTPUT_COLORSPACE_BT2020: return CLUTTER_COLORSPACE_BT2020; } @@ -650,7 +650,7 @@ get_eotf_from_monitor (MetaMonitor *monitor) if (!hdr_metadata->active) { - eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_DEFAULT; + eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB; return eotf; } @@ -660,15 +660,15 @@ get_eotf_from_monitor (MetaMonitor *monitor) eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_PQ; break; case META_OUTPUT_HDR_METADATA_EOTF_TRADITIONAL_GAMMA_SDR: - eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_DEFAULT; + eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB; break; case META_OUTPUT_HDR_METADATA_EOTF_TRADITIONAL_GAMMA_HDR: g_warning ("Unhandled HDR EOTF (traditional gamma hdr)"); - eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_DEFAULT; + eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB; break; case META_OUTPUT_HDR_METADATA_EOTF_HLG: g_warning ("Unhandled HDR EOTF (HLG)"); - eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_DEFAULT; + eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB; break; } diff --git a/src/tests/clutter/conform/actor-color-state.c b/src/tests/clutter/conform/actor-color-state.c index 8de1a27ea..fffba5074 100644 --- a/src/tests/clutter/conform/actor-color-state.c +++ b/src/tests/clutter/conform/actor-color-state.c @@ -37,7 +37,7 @@ actor_color_state_default (void) colorimetry = clutter_color_state_get_colorimetry (color_state); g_assert_cmpuint (colorimetry->type, ==, CLUTTER_COLORIMETRY_TYPE_COLORSPACE); - g_assert_cmpuint (colorimetry->colorspace, ==, CLUTTER_COLORSPACE_DEFAULT); + g_assert_cmpuint (colorimetry->colorspace, ==, CLUTTER_COLORSPACE_SRGB); clutter_actor_destroy (actor); } @@ -132,9 +132,9 @@ actor_unset_color_state (void) eotf = clutter_color_state_get_eotf (color_state); g_assert_cmpuint (colorimetry->type, ==, CLUTTER_COLORIMETRY_TYPE_COLORSPACE); - g_assert_cmpuint (colorimetry->colorspace, ==, CLUTTER_COLORSPACE_DEFAULT); + g_assert_cmpuint (colorimetry->colorspace, ==, CLUTTER_COLORSPACE_SRGB); g_assert_cmpuint (eotf->type, ==, CLUTTER_EOTF_TYPE_NAMED); - g_assert_cmpuint (eotf->tf_name, ==, CLUTTER_TRANSFER_FUNCTION_DEFAULT); + g_assert_cmpuint (eotf->tf_name, ==, CLUTTER_TRANSFER_FUNCTION_SRGB); clutter_actor_destroy (actor); } diff --git a/src/wayland/meta-wayland-color-management.c b/src/wayland/meta-wayland-color-management.c index 93f92f882..c7d231436 100644 --- a/src/wayland/meta-wayland-color-management.c +++ b/src/wayland/meta-wayland-color-management.c @@ -202,7 +202,6 @@ clutter_tf_to_wayland (ClutterTransferFunction tf) { switch (tf) { - case CLUTTER_TRANSFER_FUNCTION_DEFAULT: case CLUTTER_TRANSFER_FUNCTION_SRGB: return XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_SRGB; case CLUTTER_TRANSFER_FUNCTION_PQ: @@ -237,7 +236,6 @@ clutter_primaries_to_wayland (ClutterColorspace primaries) { switch (primaries) { - case CLUTTER_COLORSPACE_DEFAULT: case CLUTTER_COLORSPACE_SRGB: return XX_COLOR_MANAGER_V4_PRIMARIES_SRGB; case CLUTTER_COLORSPACE_BT2020: @@ -885,7 +883,7 @@ creator_params_create (struct wl_client *client, primaries = NULL; break; case CLUTTER_COLORIMETRY_TYPE_PRIMARIES: - colorspace = CLUTTER_COLORSPACE_DEFAULT; + colorspace = CLUTTER_COLORSPACE_SRGB; primaries = creator_params->colorimetry.primaries; break; }