| commit | 947d2a482e414ac471e507c8fd76d743b9f3d035 | [log] [tgz] |
|---|---|---|
| author | Brian Johnson <hibrian@google.com> | Fri Aug 12 22:20:19 2022 +0000 |
| committer | Brian Johnson <hibrian@google.com> | Wed Aug 24 00:18:19 2022 +0000 |
| tree | 9ff127949061c506cc3ac74d55e82e8e64e55dc2 | |
| parent | 1cf6d7f4cacfed91900c1af5d1a2872ae04dc8ff [diff] [blame] |
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 Merged-In: Ic0317b34978c2ae8d5c057c0a39ed889b86b3da0
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index bc11d87..b724daa 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp
@@ -1494,7 +1494,8 @@ void Output::renderCachedSets(const CompositionRefreshArgs& refreshArgs) { if (mPlanner) { - mPlanner->renderCachedSets(getState(), refreshArgs.scheduledFrameTime); + mPlanner->renderCachedSets(getState(), refreshArgs.scheduledFrameTime, + getState().usesDeviceComposition || getSkipColorTransform()); } }