commit 5ba978380fbb403cdc908d9dc3a30a2b11474e06
author Alec Mouri <alecmouri@google.com> Mon Jul 31 20:19:38 2023 +0000
committer Alec Mouri <alecmouri@google.com> Fri Aug 04 14:56:57 2023 +0000
tree 7db7800954e0052ade0a4b7b83a4189a30d5f25f
parent 78add9067092e01b3ad0be0ba3a4d25a176ab2b8

Support TextureView/ImageView HDR for COLOR_MODE_HDR

Bug: 284006942
Test: HwAccelerationTest
Change-Id: I040f3090c2eca8b89ba1db70ef5cbfae02dcb33b

libs/hwui/Tonemapper.cpp

diff --git a/libs/hwui/Tonemapper.cpp b/libs/hwui/Tonemapper.cpp
index 974a5d0..ae29edf 100644
--- a/libs/hwui/Tonemapper.cpp
+++ b/libs/hwui/Tonemapper.cpp
@@ -20,6 +20,7 @@
 #include <log/log.h>
 // libshaders only exists on Android devices
 #ifdef __ANDROID__
+#include <renderthread/CanvasContext.h>
 #include <shaders/shaders.h>
 #endif
 
@@ -53,8 +54,17 @@
 
     ColorFilterRuntimeEffectBuilder effectBuilder(std::move(runtimeEffect));
 
+    auto colorTransform = android::mat4();
+    const auto* context = renderthread::CanvasContext::getActiveContext();
+    if (context) {
+        const auto ratio = context->targetSdrHdrRatio();
+        if (ratio > 1.0f) {
+            colorTransform = android::mat4::scale(vec4(ratio, ratio, ratio, 1.f));
+        }
+    }
+
     const auto uniforms =
-            shaders::buildLinearEffectUniforms(linearEffect, android::mat4(), maxDisplayLuminance,
+            shaders::buildLinearEffectUniforms(linearEffect, colorTransform, maxDisplayLuminance,
                                                currentDisplayLuminanceNits, maxLuminance);
 
     for (const auto& uniform : uniforms) {