Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2026-07-21 14:52:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[idd/client] apply the Windows display color transform

Browse Source 
Honor the IddCx 3x4 XYZ matrix and post-transfer LUT in the IDD
conversion pipeline. Carry transform changes to the client so EGL applies
the same calibration to hardware cursors, and invalidate the full frame
whenever calibration changes.
This commit is contained in:
Geoffrey McRae
2026-07-19 03:11:42 +10:00
parent ad5d7753e8
commit 26ca90893a
17 changed files with 766 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
client/renderers/EGL/shader/cursor_rgb.frag
View File

@@ -9,10 +9,56 @@ in vec2 uv;
out vec4 color;
uniform sampler2D sampler1;
uniform sampler2D sampler2;
uniform float scale;
uniform int cbMode;
uniform bool mapSDRtoPQ;
uniform int wireTransfer; // 0: sRGB, 1: scRGB, 2: PQ
uniform float sdrWhiteLevel;
uniform uint colorTransformFlags;
uniform vec4 colorMatrix[3];
uniform float colorTransformScalar;
const uint COLOR_TRANSFORM_MATRIX = 1u;
const uint COLOR_TRANSFORM_LUT = 2u;
vec3 bt709ToXYZ(vec3 rgb)
{
return vec3(
dot(rgb, vec3(0.4123908, 0.3575843, 0.1804808)),
dot(rgb, vec3(0.2126390, 0.7151687, 0.0721923)),
dot(rgb, vec3(0.0193308, 0.1191948, 0.9505322)));
}
vec3 xyzToBT709(vec3 xyz)
{
return vec3(
dot(xyz, vec3( 3.2409699, -1.5373832, -0.4986108)),
dot(xyz, vec3(-0.9692436, 1.8759675, 0.0415551)),
dot(xyz, vec3( 0.0556301, -0.2039770, 1.0569715)));
}
vec3 xyzToBT2020(vec3 xyz)
{
return vec3(
dot(xyz, vec3( 1.7166512, -0.3556708, -0.2533663)),
dot(xyz, vec3(-0.6666844, 1.6164812, 0.0157685)),
dot(xyz, vec3( 0.0176399, -0.0427706, 0.9421031)));
}
vec3 applyColorLUT(vec3 value)
{
vec3 pos = clamp(value, 0.0, 1.0) * 4095.0;
ivec3 lo = ivec3(floor(pos));
ivec3 hi = min(lo + ivec3(1), ivec3(4095));
vec3 f = fract(pos);
return vec3(
mix(texelFetch(sampler2, ivec2(lo.r, 0), 0).r,
texelFetch(sampler2, ivec2(hi.r, 0), 0).r, f.r),
mix(texelFetch(sampler2, ivec2(lo.g, 0), 0).g,
texelFetch(sampler2, ivec2(hi.g, 0), 0).g, f.g),
mix(texelFetch(sampler2, ivec2(lo.b, 0), 0).b,
texelFetch(sampler2, ivec2(hi.b, 0), 0).b, f.b));
}
void main()
{
@@ -31,17 +77,35 @@ void main()
if (cbMode > 0)
color = cbTransform(color, cbMode);
if (mapSDRtoPQ)
if (color.a > 0.0 && (wireTransfer != 0 || colorTransformFlags != 0u))
{
if (color.a > 0.0)
// Cursor pixels are premultiplied sRGB. Work on straight, linear BT.709
// values through the XYZ calibration stage, encode for the active wire
// format, apply its 1D LUT, then restore premultiplication.
vec3 value = srgb2lin(clamp(color.rgb / color.a, 0.0, 1.0));
if ((colorTransformFlags & COLOR_TRANSFORM_MATRIX) != 0u)
{
// Cursor pixels are premultiplied. Convert the straight color to PQ,
// then premultiply again so the blend operation remains valid.
vec3 srgb = clamp(color.rgb / color.a, 0.0, 1.0);
vec3 linear = bt709to2020(srgb2lin(srgb));
color.rgb = lin2pq(linear * (sdrWhiteLevel / 10000.0)) * color.a;
vec3 xyz = bt709ToXYZ(value);
xyz = vec3(
dot(vec4(xyz, 1.0), colorMatrix[0]),
dot(vec4(xyz, 1.0), colorMatrix[1]),
dot(vec4(xyz, 1.0), colorMatrix[2])) * colorTransformScalar;
value = wireTransfer == 2 ? xyzToBT2020(xyz) : xyzToBT709(xyz);
}
else if (wireTransfer == 2)
value = bt709to2020(value);
if (wireTransfer == 2)
value = lin2pq(max(value, 0.0) * (sdrWhiteLevel / 10000.0));
else if (wireTransfer == 1)
value *= sdrWhiteLevel / 80.0;
else
color.rgb = vec3(0.0);
value = lin2srgb(max(value, 0.0));
if ((colorTransformFlags & COLOR_TRANSFORM_LUT) != 0u)
value = applyColorLUT(value);
color.rgb = value * color.a;
}
else if (color.a == 0.0)
color.rgb = vec3(0.0);
}