yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

backends/drm: adapt the color factors to the target colorspace

Browse source 
Otherwise the effect of night color is much bigger in larger colorspaces.
This is mostly a workaround, but the better solution (adapting the color
temperature of the colorspace instead) will have to wait for 6.1

BUG: 483801
FIXED-IN: 6.0.5
This commit is contained in:
Xaver Hugl 2024-05-10 18:29:09 +02:00
parent e04ec0ce29
commit 9fef6380d4
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/backends/drm/drm_egl_layer_surface.cpp
View file

@ -102,6 +102,9 @@ std::optional<OutputLayerBeginFrameInfo> EglGbmLayerSurface::startRendering(cons
m_surface->colormanagementEnabled = enableColormanagement; m_surface->colormanagementEnabled = enableColormanagement;
m_surface->targetColorDescription = colorDescription; m_surface->targetColorDescription = colorDescription;
m_surface->channelFactors = channelFactors; m_surface->channelFactors = channelFactors;
m_surface->adaptedChannelFactors = Colorimetry::fromName(NamedColorimetry::BT709).toOther(colorDescription.colorimetry()) * channelFactors;
// normalize red to be the original brightness value again
m_surface->adaptedChannelFactors *= channelFactors.x() / m_surface->adaptedChannelFactors.x();
m_surface->iccProfile = iccProfile; m_surface->iccProfile = iccProfile;
m_surface->brightness = brightness; m_surface->brightness = brightness;
if (iccProfile) { if (iccProfile) {
@ -185,16 +188,16 @@ bool EglGbmLayerSurface::endRendering(const QRegion &damagedRegion, OutputFrame
GLFramebuffer::pushFramebuffer(fbo); GLFramebuffer::pushFramebuffer(fbo);
ShaderBinder binder = m_surface->iccShader ? ShaderBinder(m_surface->iccShader->shader()) : ShaderBinder(ShaderTrait::MapTexture | ShaderTrait::TransformColorspace); ShaderBinder binder = m_surface->iccShader ? ShaderBinder(m_surface->iccShader->shader()) : ShaderBinder(ShaderTrait::MapTexture | ShaderTrait::TransformColorspace);
if (m_surface->iccShader) { if (m_surface->iccShader) {
m_surface->iccShader->setUniforms(m_surface->iccProfile, m_surface->intermediaryColorDescription.sdrBrightness(), m_surface->channelFactors); m_surface->iccShader->setUniforms(m_surface->iccProfile, m_surface->intermediaryColorDescription.sdrBrightness(), m_surface->adaptedChannelFactors);
} else { } else {
// enforce a 25 nits minimum sdr brightness // enforce a 25 nits minimum sdr brightness
constexpr double minBrightness = 25; constexpr double minBrightness = 25;
const double sdrBrightness = m_surface->intermediaryColorDescription.sdrBrightness(); const double sdrBrightness = m_surface->intermediaryColorDescription.sdrBrightness();
const double brightnessFactor = (m_surface->brightness * (1 - (minBrightness / sdrBrightness))) + (minBrightness / sdrBrightness); const double brightnessFactor = (m_surface->brightness * (1 - (minBrightness / sdrBrightness))) + (minBrightness / sdrBrightness);
QMatrix4x4 ctm; QMatrix4x4 ctm;
ctm(0, 0) = m_surface->channelFactors.x() * brightnessFactor; ctm(0, 0) = m_surface->adaptedChannelFactors.x() * brightnessFactor;
ctm(1, 1) = m_surface->channelFactors.y() * brightnessFactor; ctm(1, 1) = m_surface->adaptedChannelFactors.y() * brightnessFactor;
ctm(2, 2) = m_surface->channelFactors.z() * brightnessFactor; ctm(2, 2) = m_surface->adaptedChannelFactors.z() * brightnessFactor;
binder.shader()->setUniform(GLShader::Mat4Uniform::ColorimetryTransformation, ctm); binder.shader()->setUniform(GLShader::Mat4Uniform::ColorimetryTransformation, ctm);
binder.shader()->setUniform(GLShader::IntUniform::SourceNamedTransferFunction, int(m_surface->intermediaryColorDescription.transferFunction())); binder.shader()->setUniform(GLShader::IntUniform::SourceNamedTransferFunction, int(m_surface->intermediaryColorDescription.transferFunction()));
binder.shader()->setUniform(GLShader::IntUniform::DestinationNamedTransferFunction, int(m_surface->targetColorDescription.transferFunction())); binder.shader()->setUniform(GLShader::IntUniform::DestinationNamedTransferFunction, int(m_surface->targetColorDescription.transferFunction()));

1
src/backends/drm/drm_egl_layer_surface.h
View file

@ -102,6 +102,7 @@ private:
ColorDescription intermediaryColorDescription = ColorDescription::sRGB; ColorDescription intermediaryColorDescription = ColorDescription::sRGB;
QVector3D channelFactors = {1, 1, 1}; QVector3D channelFactors = {1, 1, 1};
double brightness = 1.0; double brightness = 1.0;
QVector3D adaptedChannelFactors = {1, 1, 1};
std::unique_ptr<IccShader> iccShader; std::unique_ptr<IccShader> iccShader;
std::shared_ptr<IccProfile> iccProfile; std::shared_ptr<IccProfile> iccProfile;