diff options
Diffstat (limited to 'services/surfaceflinger/CompositionEngine/src/Output.cpp')
| -rw-r--r-- | services/surfaceflinger/CompositionEngine/src/Output.cpp | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/services/surfaceflinger/CompositionEngine/src/Output.cpp b/services/surfaceflinger/CompositionEngine/src/Output.cpp index a9d8e3851e..1fde0925de 100644 --- a/services/surfaceflinger/CompositionEngine/src/Output.cpp +++ b/services/surfaceflinger/CompositionEngine/src/Output.cpp @@ -22,6 +22,7 @@ #include <compositionengine/LayerFE.h> #include <compositionengine/LayerFECompositionState.h> #include <compositionengine/RenderSurface.h> +#include <compositionengine/UdfpsExtension.h> #include <compositionengine/impl/HwcAsyncWorker.h> #include <compositionengine/impl/Output.h> #include <compositionengine/impl/OutputCompositionState.h> @@ -875,7 +876,10 @@ void Output::writeCompositionState(const compositionengine::CompositionRefreshAr compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition() const { compositionengine::OutputLayer* layerRequestingBgComposition = nullptr; - for (auto* layer : getOutputLayersOrderedByZ()) { + for (size_t i = 0; i < getOutputLayerCount(); i++) { + compositionengine::OutputLayer* layer = getOutputLayerOrderedByZByIndex(i); + compositionengine::OutputLayer* nextLayer = getOutputLayerOrderedByZByIndex(i + 1); + auto* compState = layer->getLayerFE().getCompositionState(); // If any layer has a sideband stream, we will disable blurs. In that case, we don't @@ -889,6 +893,16 @@ compositionengine::OutputLayer* Output::findLayerRequestingBackgroundComposition if (compState->backgroundBlurRadius > 0 || compState->blurRegions.size() > 0) { layerRequestingBgComposition = layer; } + + // If the next layer is the Udfps touched layer, enable client composition for it + // because that somehow leads to the Udfps touched layer getting device composition + // consistently. + if ((nextLayer != nullptr && layerRequestingBgComposition == nullptr) && + (strncmp(nextLayer->getLayerFE().getDebugName(), UDFPS_TOUCHED_LAYER_NAME, + strlen(UDFPS_TOUCHED_LAYER_NAME)) == 0)) { + layerRequestingBgComposition = layer; + break; + } } return layerRequestingBgComposition; } @@ -1322,7 +1336,8 @@ std::optional<base::unique_fd> Output::composeSurfaces( std::any_of(clientCompositionLayers.begin(), clientCompositionLayers.end(), [outputDataspace = clientCompositionDisplay.outputDataspace](const auto& layer) { - return layer.sourceDataspace != outputDataspace; + return layer.sourceDataspace != ui::Dataspace::UNKNOWN + && layer.sourceDataspace != outputDataspace; }); if (expensiveRenderingExpected) { setExpensiveRenderingExpected(true); |