commit 27aa241ba33990286ee91943b59084a89ddefbb8
author Sally Qi <sallyqi@google.com> Thu Dec 12 14:14:06 2024 -0800
committer Sally Qi <sallyqi@google.com> Tue Dec 17 13:05:51 2024 -0800
tree 13f84d3c20321f765ff470abc24aec29bd9517f1
parent a9464874d395d8e206acfd82149fd401589d7aae

[Lut shader] in Adaptive mode, GPU path outputs gamma 2p2 encoding for
HDR layer.

Relnote: apply a gamma2.2 compensation when a gamma_oetf dimming stage
is used.

Bug: 380894872
Test: builds
Flag: EXEMPT no flag needed

Change-Id: I048d370725a7f78732689b3fef674772a874e0f3

libs/renderengine/skia/SkiaRenderEngine.cpp

diff --git a/libs/renderengine/skia/SkiaRenderEngine.cpp b/libs/renderengine/skia/SkiaRenderEngine.cpp
index b986967..7c9ea93 100644
--- a/libs/renderengine/skia/SkiaRenderEngine.cpp
+++ b/libs/renderengine/skia/SkiaRenderEngine.cpp
@@ -544,9 +544,18 @@
     }
 
     if (graphicBuffer && parameters.layer.luts) {
+        const bool dimInLinearSpace = parameters.display.dimmingStage !=
+                aidl::android::hardware::graphics::composer3::DimmingStage::GAMMA_OETF;
+        const ui::Dataspace runtimeEffectDataspace = !dimInLinearSpace
+                ? static_cast<ui::Dataspace>(
+                          (parameters.outputDataSpace & ui::Dataspace::STANDARD_MASK) |
+                          ui::Dataspace::TRANSFER_GAMMA2_2 |
+                          (parameters.outputDataSpace & ui::Dataspace::RANGE_MASK))
+                : parameters.outputDataSpace;
+
         shader = mLutShader.lutShader(shader, parameters.layer.luts,
                                       parameters.layer.sourceDataspace,
-                                      toSkColorSpace(parameters.outputDataSpace));
+                                      toSkColorSpace(runtimeEffectDataspace));
     }
 
     if (parameters.requiresLinearEffect) {