commit 869e28fbfcfa43bafa312e373b5e2df43237862f
author Brian Johnson <hibrian@google.com> Fri Aug 12 22:20:19 2022 +0000
committer Brian Johnson <hibrian@google.com> Tue Aug 23 08:55:02 2022 -0700
tree 1f7c7d9f7295e1335fbed78e199168844958bc34
parent 315628b575ddb9dcc5bb34bbe931285f62231f14

Plumb through Output::getSkipColorTransform() into CachedSet, to match the behavior in Output::composeSurfaces().

Bug: 240293363
Test: atest libcompositionengine_test. Fixed tests, added CachedSetTest::renderWhitePointNoColorTransform

Change-Id: Ic0317b34978c2ae8d5c057c0a39ed889b86b3da0

services/surfaceflinger/CompositionEngine/src/Output.cpp

diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp
index 6edc00f..06ae9e9 100644
--- a/services/surfaceflinger/CompositionEngine/src/Output.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1536,7 +1536,8 @@
 
 void Output::renderCachedSets(const CompositionRefreshArgs& refreshArgs) {
     if (mPlanner) {
-        mPlanner->renderCachedSets(getState(), refreshArgs.scheduledFrameTime);
+        mPlanner->renderCachedSets(getState(), refreshArgs.scheduledFrameTime,
+                                   getState().usesDeviceComposition || getSkipColorTransform());
     }
 }