AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-08 17:50:10 +00:00
Code Issues Projects Releases Wiki Activity

wayland: Support explicit primaries

Browse Source 
Use the new primaries color state support to handle the situation
where the compositor gives us numeric primaries instead of named
ones.
This commit is contained in:
Matthias Clasen 2024-08-14 17:35:55 -04:00
parent b073698796
commit 23cd71eeb0
1 changed files with 85 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
gdk/wayland/gdkwaylandcolor.c
View File

@ -322,28 +322,23 @@ create_image_desc (GdkWaylandColor *color,
gboolean sync) gboolean sync)
{ {
CsImageDescListenerData data; CsImageDescListenerData data;
struct xx_image_description_creator_params_v4 *creator; struct xx_image_description_creator_params_v4 *creator = NULL;
struct xx_image_description_v4 *desc; struct xx_image_description_v4 *desc;
const GdkCicp *cicp; const GdkCicp *cicp;
GdkCicp norm;
uint32_t primaries, tf;
cicp = gdk_color_state_get_cicp (cs); cicp = gdk_color_state_get_cicp (cs);
if (!cicp) if (cicp && cicp->color_primaries != 2)
{ {
GDK_DEBUG (MISC, "Unsupported color state %s: Not a CICP colorstate", GdkCicp norm;
gdk_color_state_get_name (cs)); uint32_t primaries_named;
g_hash_table_insert (color->cs_to_desc, gdk_color_state_ref (cs), NULL); uint32_t tf_named;
return;
}
gdk_cicp_normalize (cicp, &norm); gdk_cicp_normalize (cicp, &norm);
primaries = cicp_to_wl_primaries (norm.color_primaries); primaries_named = cicp_to_wl_primaries (norm.color_primaries);
tf = cicp_to_wl_transfer (norm.transfer_function); tf_named = cicp_to_wl_transfer (norm.transfer_function);
if (((color->color_manager_supported.primaries & (1 << primaries)) == 0 && if ((color->color_manager_supported.primaries & (1 << primaries_named)) == 0 ||
(color->color_manager_supported.features & (1 << XX_COLOR_MANAGER_V4_FEATURE_SET_PRIMARIES)) == 0) || (color->color_manager_supported.transfers & (1 << tf_named)) == 0)
(color->color_manager_supported.transfers & (1 << tf)) == 0)
{ {
GDK_DEBUG (MISC, "Unsupported color state %s: Primaries or transfer function unsupported", GDK_DEBUG (MISC, "Unsupported color state %s: Primaries or transfer function unsupported",
gdk_color_state_get_name (cs)); gdk_color_state_get_name (cs));
@ -351,30 +346,56 @@ create_image_desc (GdkWaylandColor *color,
return; return;
} }
creator = xx_color_manager_v4_new_parametric_creator (color->color_manager);
xx_image_description_creator_params_v4_set_primaries_named (creator, primaries_named);
xx_image_description_creator_params_v4_set_tf_named (creator, tf_named);
}
else if (cicp && cicp->color_primaries == 2)
{
const GdkPrimaries *primaries = gdk_color_state_get_primaries (cs);
GdkCicp norm;
uint32_t tf_named;
gdk_cicp_normalize (cicp, &norm);
tf_named = cicp_to_wl_transfer (norm.transfer_function);
if ((color->color_manager_supported.features & (1 << XX_IMAGE_DESCRIPTION_CREATOR_PARAMS_V4_SET_PRIMARIES)) == 0 ||
(color->color_manager_supported.transfers & (1 << tf_named)) == 0)
{
GDK_DEBUG (MISC, "Unsupported color state %s: Primaries or transfer function unsupported",
gdk_color_state_get_name (cs));
g_hash_table_insert (color->cs_to_desc, gdk_color_state_ref (cs), NULL);
return;
}
creator = xx_color_manager_v4_new_parametric_creator (color->color_manager);
xx_image_description_creator_params_v4_set_primaries (creator,
primaries->rx * 10000,
primaries->ry * 10000,
primaries->gx * 10000,
primaries->gy * 10000,
primaries->bx * 10000,
primaries->by * 10000,
primaries->wx * 10000,
primaries->wy * 10000);
xx_image_description_creator_params_v4_set_tf_named (creator, tf_named);
}
else
{
GDK_DEBUG (MISC, "Unsupported color state %s: Primaries or transfer function unsupported", gdk_color_state_get_name (cs));
g_hash_table_insert (color->cs_to_desc, gdk_color_state_ref (cs), NULL);
return;
}
desc = xx_image_description_creator_params_v4_create (creator);
data.color = color; data.color = color;
data.color_state = cs; data.color_state = cs;
data.sync = sync; data.sync = sync;
data.done = FALSE; data.done = FALSE;
creator = xx_color_manager_v4_new_parametric_creator (color->color_manager);
if (color->color_manager_supported.primaries & (1 << primaries))
{
xx_image_description_creator_params_v4_set_primaries_named (creator, primaries);
}
else
{
const uint *p = wl_primaries_to_primaries (primaries);
xx_image_description_creator_params_v4_set_primaries (creator,
p[0], p[1],
p[2], p[3],
p[4], p[5],
p[6], p[7]);
}
xx_image_description_creator_params_v4_set_tf_named (creator, tf);
desc = xx_image_description_creator_params_v4_create (creator);
if (sync) if (sync)
{ {
struct wl_event_queue *event_queue; struct wl_event_queue *event_queue;
@ -523,17 +544,9 @@ struct _ImageDescription
static GdkColorState * static GdkColorState *
gdk_color_state_from_image_description_bits (ImageDescription *desc) gdk_color_state_from_image_description_bits (ImageDescription *desc)
{ {
if (desc->has_primaries_named && desc->has_tf_named)
{
GdkCicp cicp;
GdkLuminance lum; GdkLuminance lum;
GdkLuminance *luminance = NULL; GdkLuminance *luminance = NULL;
cicp.color_primaries = wl_to_cicp_primaries (desc->primaries);
cicp.transfer_function = wl_to_cicp_transfer (desc->tf_named);
cicp.matrix_coefficients = 0;
cicp.range = GDK_CICP_RANGE_FULL;
if (desc->has_luminances) if (desc->has_luminances)
{ {
lum.min = desc->min_lum * 10000; lum.min = desc->min_lum * 10000;
@ -542,8 +555,32 @@ gdk_color_state_from_image_description_bits (ImageDescription *desc)
luminance = &lum; luminance = &lum;
} }
if (desc->has_primaries_named && desc->has_tf_named)
{
GdkCicp cicp;
cicp.color_primaries = wl_to_cicp_primaries (desc->primaries);
cicp.transfer_function = wl_to_cicp_transfer (desc->tf_named);
cicp.matrix_coefficients = 0;
cicp.range = GDK_CICP_RANGE_FULL;
return gdk_color_state_new_for_cicp (&cicp, luminance, NULL); return gdk_color_state_new_for_cicp (&cicp, luminance, NULL);
} }
else if (desc->has_primaries && desc->has_tf_named)
{
GdkPrimaries primaries;
primaries.rx = desc->r_x / 10000.0;
primaries.ry = desc->r_y / 10000.0;
primaries.gx = desc->g_x / 10000.0;
primaries.gy = desc->g_y / 10000.0;
primaries.bx = desc->b_x / 10000.0;
primaries.by = desc->b_y / 10000.0;
primaries.wx = desc->w_x / 10000.0;
primaries.wy = desc->w_y / 10000.0;
return gdk_color_state_new_for_primaries (&primaries, luminance, desc->tf_named, NULL);
}
else else
return NULL; return NULL;
} }