AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-12-27 22:20:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'matthiasc/for-main' into 'main'

Browse Source 
gpu: More debug spew

See merge request GNOME/gtk!7499
This commit is contained in:
Matthias Clasen 2024-07-26 12:07:55 +00:00
commit 12c7f2d4fd
2 changed files with 32 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gsk/gpu/gskgpuconvertcicpop.c
View File

@ -31,6 +31,8 @@ gsk_gpu_convert_cicp_op_print_instance (GskGpuShaderOp *shader,
gsk_gpu_print_image (string, shader->images[0]);
if (shader->variation & VARIATION_STRAIGHT_ALPHA)
gsk_gpu_print_string (string, "straight");
if (shader->variation & VARIATION_REVERSE)
gsk_gpu_print_string (string, "reverse");
g_string_append_printf (string, "cicp %u/%u/%u/%u",
instance->color_primaries,
instance->transfer_function,

60
gsk/gpu/shaders/gskgpuconvertcicp.glsl
View File

@ -95,12 +95,12 @@ cicp_to_xyz (uint cp)
{
switch (cp)
{
case 1: return srgb_to_xyz;
case 5: return pal_to_xyz;
case 6: return ntsc_to_xyz;
case 9: return rec2020_to_xyz;
case 10: return identity;
case 12: return p3_to_xyz;
case 1u: return srgb_to_xyz;
case 5u: return pal_to_xyz;
case 6u: return ntsc_to_xyz;
case 9u: return rec2020_to_xyz;
case 10u: return identity;
case 12u: return p3_to_xyz;
default: return identity;
}
}
@ -110,12 +110,12 @@ cicp_from_xyz (uint cp)
{
switch (cp)
{
case 1: return xyz_to_srgb;
case 5: return xyz_to_pal;
case 6: return xyz_to_ntsc;
case 9: return xyz_to_rec2020;
case 10: return identity;
case 12: return xyz_to_p3;
case 1u: return xyz_to_srgb;
case 5u: return xyz_to_pal;
case 6u: return xyz_to_ntsc;
case 9u: return xyz_to_rec2020;
case 10u: return identity;
case 12u: return xyz_to_p3;
default: return identity;
}
}
@ -208,28 +208,28 @@ apply_cicp_eotf (vec3 color,
{
switch (transfer_function)
{
case 1:
case 6:
case 14:
case 15:
case 1u:
case 6u:
case 14u:
case 15u:
return vec3 (bt709_eotf (color.r),
bt709_eotf (color.g),
bt709_eotf (color.b));
case 8:
case 8u:
return color;
case 13:
case 13u:
return vec3 (srgb_eotf (color.r),
srgb_eotf (color.g),
srgb_eotf (color.b));
case 16:
case 16u:
return vec3 (pq_eotf (color.r),
pq_eotf (color.g),
pq_eotf (color.b));
case 18:
case 18u:
return vec3 (hlg_eotf (color.r),
hlg_eotf (color.g),
hlg_eotf (color.b));
@ -245,28 +245,28 @@ apply_cicp_oetf (vec3 color,
{
switch (transfer_function)
{
case 1:
case 6:
case 14:
case 15:
case 1u:
case 6u:
case 14u:
case 15u:
return vec3 (bt709_oetf (color.r),
bt709_oetf (color.g),
bt709_oetf (color.b));
case 8:
case 8u:
return color;
case 13:
case 13u:
return vec3 (srgb_oetf (color.r),
srgb_oetf (color.g),
srgb_oetf (color.b));
case 16:
case 16u:
return vec3 (pq_oetf (color.r),
pq_oetf (color.g),
pq_oetf (color.b));
case 18:
case 18u:
return vec3 (hlg_oetf (color.r),
hlg_oetf (color.g),
hlg_oetf (color.b));
@ -326,11 +326,11 @@ run (out vec4 color,
pixel = texture (GSK_TEXTURE0, _tex_coord);
if (HAS_VARIATION (VARIATION_REVERSE))
pixel = convert_color_to_cicp (color,
pixel = convert_color_to_cicp (pixel,
ALT_PREMULTIPLIED,
OUTPUT_COLOR_SPACE, OUTPUT_PREMULTIPLIED);
else
pixel = convert_color_from_cicp (color,
pixel = convert_color_from_cicp (pixel,
ALT_PREMULTIPLIED,
OUTPUT_COLOR_SPACE, OUTPUT_PREMULTIPLIED);