Merge "hwc3: DisplayCommand.colorTransform is just a matrix"

1 files changed, 13 insertions, 2 deletions

diff --git a/hwc3/impl/HalImpl.cpp b/hwc3/impl/HalImpl.cpp
index f79073b..8c3e9d3 100644
--- a/hwc3/impl/HalImpl.cpp
+++ b/hwc3/impl/HalImpl.cpp
@@ -630,8 +630,19 @@ int32_t HalImpl::setColorMode(int64_t display, ColorMode mode, RenderIntent inte
     return halDisplay->setColorModeWithRenderIntent(hwcMode, hwcIntent);
 }
 
-int32_t HalImpl::setColorTransform(int64_t display, const std::vector<float>& matrix,
-                                   common::ColorTransform hint) {
+int32_t HalImpl::setColorTransform(int64_t display, const std::vector<float>& matrix) {
+    // clang-format off
+    constexpr std::array<float, 16> kIdentity = {
+        1.0f, 0.0f, 0.0f, 0.0f,
+        0.0f, 1.0f, 0.0f, 0.0f,
+        0.0f, 0.0f, 1.0f, 0.0f,
+        0.0f, 0.0f, 0.0f, 1.0f,
+    };
+    // clang-format on
+    const bool isIdentity = (std::equal(matrix.begin(), matrix.end(), kIdentity.begin()));
+    const common::ColorTransform hint = isIdentity ? common::ColorTransform::IDENTITY
+                                                   : common::ColorTransform::ARBITRARY_MATRIX;
+
     ExynosDisplay* halDisplay;
     RET_IF_ERR(getHalDisplay(display, halDisplay));