commit c7e8ce8f8dc3f6b9546b7dc1fa6a9965225259c1
author Alec Mouri <alecmouri@google.com> Tue Apr 02 12:28:05 2019 -0700
committer Alec Mouri <alecmouri@google.com> Tue Apr 02 14:29:04 2019 -0700
tree 4804c81a70b9fe36054cf3d00f7c9a5bbb1a1f74
parent 945a7006f905b5f460668923b9875cd6637931a6

Actually apply color transform for GPU comp.

Bug: 129573282
Test: boots
Change-Id: I0a2f9c87fd2eb09ea9c343d5ec9b309644aaeb8b

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 0345baf..787f12c 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -3288,7 +3288,6 @@
     const bool hasClientComposition = getHwComposer().hasClientComposition(displayId);
     ATRACE_INT("hasClientComposition", hasClientComposition);
 
-    mat4 colorMatrix;
     bool applyColorMatrix = false;
 
     renderengine::DisplaySettings clientCompositionDisplay;
@@ -3346,7 +3345,7 @@
         // Compute the global color transform matrix.
         applyColorMatrix = !hasDeviceComposition && !skipClientColorTransform;
         if (applyColorMatrix) {
-            clientCompositionDisplay.colorTransform = colorMatrix;
+            clientCompositionDisplay.colorTransform = displayState.colorTransformMat;
         }
     }