commit 396f3bb4bfb6a546c6bc2501860753a86b88a201
author Courtney Goeltzenleuchter <courtneygo@google.com> Fri May 05 15:09:14 2017 -0600
committer Courtney Goeltzenleuchter <courtneygo@google.com> Mon May 08 11:20:17 2017 -0600
tree c5cc4e67f19c640d55cdea39e333cc1519d70c1f
parent 1d4f7a281c8380c05c3e86998f8ff653e7e5470c

Use more robust color transform

Previous code depended on P3 and sRGB being defined with
the same white-point. New code uses a more robust mechanism
that doesn't have that requirement.
Test: run app that uses wide-color, check that nav and status
      haven't changed color
Bug: 29940137

Change-Id: I8cd4c918567f126b17ebfb51e37fc52515d08308

services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp

diff --git a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
index 04fe182..18b2e1b 100644
--- a/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
+++ b/services/surfaceflinger/RenderEngine/GLES20RenderEngine.cpp
@@ -143,7 +143,7 @@
         // Compute sRGB to DisplayP3 color transform
         // NOTE: For now, we are limiting wide-color support to
         // Display-P3 only.
-        mat3 srgbToP3 = ColorSpace::DisplayP3().getXYZtoRGB() * ColorSpace::sRGB().getRGBtoXYZ();
+        mat3 srgbToP3 = ColorSpaceConnector(ColorSpace::sRGB(), ColorSpace::DisplayP3()).getTransform();
 
         // color transform needs to be transposed and expanded to 4x4
         // to be what the shader wants