brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clutter/color-state: Drop using default colorspace and default tf

Browse Source 
Use the defaults explicitliy, which is SRGB for both.

Part-of: <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4020>
This commit is contained in:
Joan Torres 2024-09-20 17:42:57 +02:00 committed by Marge Bot
parent eff17bf1b5
commit 3b53f7cb6c
6 changed files with 12 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
clutter/clutter/clutter-color-manager.c
View File

@ -148,8 +148,8 @@ clutter_color_manager_get_default_color_state (ClutterColorManager *color_manage
{ {
color_manager->default_color_state = color_manager->default_color_state =
clutter_color_state_new (color_manager->context, clutter_color_state_new (color_manager->context,
CLUTTER_COLORSPACE_DEFAULT, CLUTTER_COLORSPACE_SRGB,
CLUTTER_TRANSFER_FUNCTION_DEFAULT); CLUTTER_TRANSFER_FUNCTION_SRGB);
} }
return color_manager->default_color_state; return color_manager->default_color_state;

12
clutter/clutter/clutter-color-state.c
View File

@ -116,8 +116,6 @@ clutter_colorspace_to_string (ClutterColorspace colorspace)
{ {
switch (colorspace) switch (colorspace)
{ {
case CLUTTER_COLORSPACE_DEFAULT:
return "unknown";
case CLUTTER_COLORSPACE_SRGB: case CLUTTER_COLORSPACE_SRGB:
return "sRGB"; return "sRGB";
case CLUTTER_COLORSPACE_BT2020: case CLUTTER_COLORSPACE_BT2020:
@ -132,8 +130,6 @@ clutter_eotf_to_string (ClutterEOTF eotf)
{ {
switch (eotf.tf_name) switch (eotf.tf_name)
{ {
case CLUTTER_TRANSFER_FUNCTION_DEFAULT:
return "default";
case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_SRGB:
return "sRGB"; return "sRGB";
case CLUTTER_TRANSFER_FUNCTION_PQ: case CLUTTER_TRANSFER_FUNCTION_PQ:
@ -200,7 +196,6 @@ clutter_eotf_get_default_luminance (ClutterEOTF eotf)
{ {
switch (eotf.tf_name) switch (eotf.tf_name)
{ {
case CLUTTER_TRANSFER_FUNCTION_DEFAULT:
case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_SRGB:
case CLUTTER_TRANSFER_FUNCTION_LINEAR: case CLUTTER_TRANSFER_FUNCTION_LINEAR:
return &sdr_default_luminance; return &sdr_default_luminance;
@ -479,7 +474,6 @@ get_eotf (ClutterColorState *color_state)
case CLUTTER_TRANSFER_FUNCTION_PQ: case CLUTTER_TRANSFER_FUNCTION_PQ:
return &pq_eotf; return &pq_eotf;
case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_SRGB:
case CLUTTER_TRANSFER_FUNCTION_DEFAULT:
return &srgb_eotf; return &srgb_eotf;
case CLUTTER_TRANSFER_FUNCTION_LINEAR: case CLUTTER_TRANSFER_FUNCTION_LINEAR:
return NULL; return NULL;
@ -501,7 +495,6 @@ get_inv_eotf (ClutterColorState *color_state)
case CLUTTER_TRANSFER_FUNCTION_PQ: case CLUTTER_TRANSFER_FUNCTION_PQ:
return &pq_inv_eotf; return &pq_inv_eotf;
case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_SRGB:
case CLUTTER_TRANSFER_FUNCTION_DEFAULT:
return &srgb_inv_eotf; return &srgb_inv_eotf;
case CLUTTER_TRANSFER_FUNCTION_LINEAR: case CLUTTER_TRANSFER_FUNCTION_LINEAR:
return NULL; return NULL;
@ -555,7 +548,6 @@ get_primaries (ClutterColorState *color_state)
case CLUTTER_COLORIMETRY_TYPE_COLORSPACE: case CLUTTER_COLORIMETRY_TYPE_COLORSPACE:
switch (priv->colorimetry.colorspace) switch (priv->colorimetry.colorspace)
{ {
case CLUTTER_COLORSPACE_DEFAULT:
case CLUTTER_COLORSPACE_SRGB: case CLUTTER_COLORSPACE_SRGB:
return &srgb_primaries; return &srgb_primaries;
case CLUTTER_COLORSPACE_BT2020: case CLUTTER_COLORSPACE_BT2020:
@ -1153,7 +1145,6 @@ clutter_color_state_required_format (ClutterColorState *color_state)
case CLUTTER_TRANSFER_FUNCTION_PQ: case CLUTTER_TRANSFER_FUNCTION_PQ:
return CLUTTER_ENCODING_REQUIRED_FORMAT_UINT10; return CLUTTER_ENCODING_REQUIRED_FORMAT_UINT10;
case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_SRGB:
case CLUTTER_TRANSFER_FUNCTION_DEFAULT:
return CLUTTER_ENCODING_REQUIRED_FORMAT_UINT8; return CLUTTER_ENCODING_REQUIRED_FORMAT_UINT8;
} }
@ -1198,7 +1189,6 @@ clutter_color_state_get_blending (ClutterColorState *color_state,
break; break;
/* effectively this means we will blend sRGB content in sRGB, not linear */ /* effectively this means we will blend sRGB content in sRGB, not linear */
case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_SRGB:
case CLUTTER_TRANSFER_FUNCTION_DEFAULT:
blending_tf = priv->eotf.tf_name; blending_tf = priv->eotf.tf_name;
break; break;
default: default:
@ -1218,7 +1208,7 @@ clutter_color_state_get_blending (ClutterColorState *color_state,
primaries = NULL; primaries = NULL;
break; break;
case CLUTTER_COLORIMETRY_TYPE_PRIMARIES: case CLUTTER_COLORIMETRY_TYPE_PRIMARIES:
colorspace = CLUTTER_COLORSPACE_DEFAULT; colorspace = CLUTTER_COLORSPACE_SRGB;
primaries = priv->colorimetry.primaries; primaries = priv->colorimetry.primaries;
break; break;
} }

2
clutter/clutter/clutter-color-state.h
View File

@ -34,14 +34,12 @@ G_BEGIN_DECLS
typedef enum typedef enum
{ {
CLUTTER_COLORSPACE_DEFAULT,
CLUTTER_COLORSPACE_SRGB, CLUTTER_COLORSPACE_SRGB,
CLUTTER_COLORSPACE_BT2020, CLUTTER_COLORSPACE_BT2020,
} ClutterColorspace; } ClutterColorspace;
typedef enum typedef enum
{ {
CLUTTER_TRANSFER_FUNCTION_DEFAULT,
CLUTTER_TRANSFER_FUNCTION_SRGB, CLUTTER_TRANSFER_FUNCTION_SRGB,
CLUTTER_TRANSFER_FUNCTION_PQ, CLUTTER_TRANSFER_FUNCTION_PQ,
CLUTTER_TRANSFER_FUNCTION_LINEAR, CLUTTER_TRANSFER_FUNCTION_LINEAR,

10
src/backends/meta-color-device.c
View File

@ -632,7 +632,7 @@ get_color_space_from_monitor (MetaMonitor *monitor)
{ {
case META_OUTPUT_COLORSPACE_DEFAULT: case META_OUTPUT_COLORSPACE_DEFAULT:
case META_OUTPUT_COLORSPACE_UNKNOWN: case META_OUTPUT_COLORSPACE_UNKNOWN:
return CLUTTER_COLORSPACE_DEFAULT; return CLUTTER_COLORSPACE_SRGB;
case META_OUTPUT_COLORSPACE_BT2020: case META_OUTPUT_COLORSPACE_BT2020:
return CLUTTER_COLORSPACE_BT2020; return CLUTTER_COLORSPACE_BT2020;
} }
@ -650,7 +650,7 @@ get_eotf_from_monitor (MetaMonitor *monitor)
if (!hdr_metadata->active) if (!hdr_metadata->active)
{ {
eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_DEFAULT; eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB;
return eotf; return eotf;
} }
@ -660,15 +660,15 @@ get_eotf_from_monitor (MetaMonitor *monitor)
eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_PQ; eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_PQ;
break; break;
case META_OUTPUT_HDR_METADATA_EOTF_TRADITIONAL_GAMMA_SDR: case META_OUTPUT_HDR_METADATA_EOTF_TRADITIONAL_GAMMA_SDR:
eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_DEFAULT; eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB;
break; break;
case META_OUTPUT_HDR_METADATA_EOTF_TRADITIONAL_GAMMA_HDR: case META_OUTPUT_HDR_METADATA_EOTF_TRADITIONAL_GAMMA_HDR:
g_warning ("Unhandled HDR 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; break;
case META_OUTPUT_HDR_METADATA_EOTF_HLG: case META_OUTPUT_HDR_METADATA_EOTF_HLG:
g_warning ("Unhandled HDR EOTF (HLG)"); g_warning ("Unhandled HDR EOTF (HLG)");
eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_DEFAULT; eotf.tf_name = CLUTTER_TRANSFER_FUNCTION_SRGB;
break; break;
} }

6
src/tests/clutter/conform/actor-color-state.c
View File

@ -37,7 +37,7 @@ actor_color_state_default (void)
colorimetry = clutter_color_state_get_colorimetry (color_state); colorimetry = clutter_color_state_get_colorimetry (color_state);
g_assert_cmpuint (colorimetry->type, ==, CLUTTER_COLORIMETRY_TYPE_COLORSPACE); 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); clutter_actor_destroy (actor);
} }
@ -132,9 +132,9 @@ actor_unset_color_state (void)
eotf = clutter_color_state_get_eotf (color_state); eotf = clutter_color_state_get_eotf (color_state);
g_assert_cmpuint (colorimetry->type, ==, CLUTTER_COLORIMETRY_TYPE_COLORSPACE); 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->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); clutter_actor_destroy (actor);
} }

4
src/wayland/meta-wayland-color-management.c
View File

@ -202,7 +202,6 @@ clutter_tf_to_wayland (ClutterTransferFunction tf)
{ {
switch (tf) switch (tf)
{ {
case CLUTTER_TRANSFER_FUNCTION_DEFAULT:
case CLUTTER_TRANSFER_FUNCTION_SRGB: case CLUTTER_TRANSFER_FUNCTION_SRGB:
return XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_SRGB; return XX_COLOR_MANAGER_V4_TRANSFER_FUNCTION_SRGB;
case CLUTTER_TRANSFER_FUNCTION_PQ: case CLUTTER_TRANSFER_FUNCTION_PQ:
@ -237,7 +236,6 @@ clutter_primaries_to_wayland (ClutterColorspace primaries)
{ {
switch (primaries) switch (primaries)
{ {
case CLUTTER_COLORSPACE_DEFAULT:
case CLUTTER_COLORSPACE_SRGB: case CLUTTER_COLORSPACE_SRGB:
return XX_COLOR_MANAGER_V4_PRIMARIES_SRGB; return XX_COLOR_MANAGER_V4_PRIMARIES_SRGB;
case CLUTTER_COLORSPACE_BT2020: case CLUTTER_COLORSPACE_BT2020:
@ -885,7 +883,7 @@ creator_params_create (struct wl_client *client,
primaries = NULL; primaries = NULL;
break; break;
case CLUTTER_COLORIMETRY_TYPE_PRIMARIES: case CLUTTER_COLORIMETRY_TYPE_PRIMARIES:
colorspace = CLUTTER_COLORSPACE_DEFAULT; colorspace = CLUTTER_COLORSPACE_SRGB;
primaries = creator_params->colorimetry.primaries; primaries = creator_params->colorimetry.primaries;
break; break;
} }