commit 9bcd1d14815dac52a51fd9b4ded391d9ad98e7bd
author Alec Mouri <alecmouri@google.com> Thu Apr 21 22:16:56 2022 +0000
committer Alec Mouri <alecmouri@google.com> Wed Apr 27 17:17:47 2022 +0000
tree 10697704af5fb1d272a9592c5c8aac29ebdf9e54
parent 585d10e60084a4eb75e99bb8e62ca14102a3b03b

Don't double-apply display color transform

When composer is already handling the display color transform, don't
apply the display color transform again when concatenating the dimming
matrix with the display-wide color transform applied in renderengine.

Bug: 229153333
Test: night light
Change-Id: Ibd468b427d574048e635c14ad831318f27a9811e

libs/renderengine/skia/SkiaGLRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaGLRenderEngine.cpp b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
index a77a798..e45de10 100644
--- a/libs/renderengine/skia/SkiaGLRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaGLRenderEngine.cpp
@@ -1190,11 +1190,15 @@
                 static constexpr float kInverseGamma22 = 1.f / 2.2f;
                 const auto gammaCorrectedDimmingRatio =
                         std::pow(layerDimmingRatio, kInverseGamma22);
-                const auto dimmingMatrix =
+                auto dimmingMatrix =
                         mat4::scale(vec4(gammaCorrectedDimmingRatio, gammaCorrectedDimmingRatio,
                                          gammaCorrectedDimmingRatio, 1.f));
-                paint.setColorFilter(SkColorFilters::Matrix(
-                        toSkColorMatrix(display.colorTransform * dimmingMatrix)));
+
+                const auto colorFilter =
+                        SkColorFilters::Matrix(toSkColorMatrix(std::move(dimmingMatrix)));
+                paint.setColorFilter(displayColorTransform
+                                             ? displayColorTransform->makeComposed(colorFilter)
+                                             : colorFilter);
             } else {
                 paint.setColorFilter(displayColorTransform);
             }