commit a9ff1f92aeccb5b4031b53886e685273b8f5ba2d
author Andrew Chant <achant@google.com> Thu Apr 04 17:39:17 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Thu Apr 04 19:38:53 2019 +0000
tree de23299bffaaa39b2b09c6c6bfddfc2cee50b8d9
parent c5a83eb29894817ad991d52049204b3b6b5d7426

Revert "[SurfaceFlinger] Remove force GPU composition for layers with color transform."

This reverts commit 37083d0515500a5e0cb24d082c72eba7f676dea5.

Reason for revert: Breaks some display output
Bug: 129945273

Merged-In: Ie0cdf9bd696ed4926fdd931d3c8a82fafd1a203f
Change-Id: Ie0cdf9bd696ed4926fdd931d3c8a82fafd1a203f
(cherry picked from commit 9055674c6c3cdf32207ccce77d27f4ea55c343f8)

services/surfaceflinger/SurfaceFlinger.cpp

diff --git a/services/surfaceflinger/SurfaceFlinger.cpp b/services/surfaceflinger/SurfaceFlinger.cpp
index 5676c59..33455b9 100644
--- a/services/surfaceflinger/SurfaceFlinger.cpp
+++ b/services/surfaceflinger/SurfaceFlinger.cpp
@@ -1822,6 +1822,11 @@
                 layer->forceClientComposition(displayDevice);
             }
 
+            // TODO(b/111562338) remove when composer 2.3 is shipped.
+            if (layer->hasColorTransform()) {
+                layer->forceClientComposition(displayDevice);
+            }
+
             if (layer->getRoundedCornerState().radius > 0.0f) {
                 layer->forceClientComposition(displayDevice);
             }