diff options
Diffstat (limited to 'services/surfaceflinger/CompositionEngine/include/compositionengine')
5 files changed, 19 insertions, 7 deletions
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h index 4266da4b07..bd33f46f6f 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/Output.h @@ -159,6 +159,7 @@ public: // only has a value if there's something needing it, like when a TrustedPresentationListener // is set std::optional<Region> aboveCoveredLayersExcludingOverlays; + int32_t aboveBlurRequests = 0; }; virtual ~Output(); diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h index 873764b065..a07508415a 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h @@ -176,6 +176,7 @@ protected: private: void dirtyEntireOutput(); compositionengine::OutputLayer* findLayerRequestingBackgroundComposition() const; + void sanitizeOutputLayers() const; void finishPrepareFrame(); ui::Dataspace getBestDataspace(ui::Dataspace*, bool*) const; compositionengine::Output::ColorProfile pickColorProfile( diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h index c558739464..3dc115e199 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/OutputLayerCompositionState.h @@ -105,6 +105,9 @@ struct OutputLayerCompositionState { // The picture profile for this layer. PictureProfileHandle pictureProfileHandle; + // ignore blur requests if there's just too many on top of this layer + bool ignoreBlur{false}; + // Overrides the buffer, acquire fence, and display frame stored in LayerFECompositionState struct { std::shared_ptr<renderengine::ExternalTexture> buffer = nullptr; diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h index 86bcf20677..e09e308a01 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/CachedSet.h @@ -42,6 +42,7 @@ public: const std::string& getName() const { return mState->getName(); } int32_t getBackgroundBlurRadius() const { return mState->getBackgroundBlurRadius(); } Rect getDisplayFrame() const { return mState->getDisplayFrame(); } + bool hasBlurBehind() const { return mState->hasBlurBehind(); } const Region& getVisibleRegion() const { return mState->getVisibleRegion(); } const sp<GraphicBuffer>& getBuffer() const { return mState->getOutputLayer()->getLayerFE().getCompositionState()->buffer; diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/LayerState.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/LayerState.h index 5e3e3d8a31..eb942421d8 100644 --- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/LayerState.h +++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/planner/LayerState.h @@ -75,6 +75,7 @@ enum class LayerStateField : uint32_t { HasProtectedContent = 1u << 19, CachingHint = 1u << 20, DimmingEnabled = 1u << 21, + BlursDisabled = 1u << 22, }; // clang-format on @@ -236,7 +237,8 @@ public: Rect getDisplayFrame() const { return mDisplayFrame.get(); } const Region& getVisibleRegion() const { return mVisibleRegion.get(); } bool hasBlurBehind() const { - return mBackgroundBlurRadius.get() > 0 || !mBlurRegions.get().empty(); + return (mBackgroundBlurRadius.get() > 0 || !mBlurRegions.get().empty()) && + !mIsBlursDisabled.get(); } int32_t getBackgroundBlurRadius() const { return mBackgroundBlurRadius.get(); } aidl::android::hardware::graphics::composer3::Composition getCompositionType() const { @@ -508,7 +510,10 @@ private: OutputLayerState<bool, LayerStateField::DimmingEnabled> mIsDimmingEnabled{ [](auto layer) { return layer->getLayerFE().getCompositionState()->dimmingEnabled; }}; - static const constexpr size_t kNumNonUniqueFields = 20; + OutputLayerState<bool, LayerStateField::BlursDisabled> mIsBlursDisabled{ + [](auto layer) { return layer->getState().ignoreBlur; }}; + + static const constexpr size_t kNumNonUniqueFields = 21; std::array<StateInterface*, kNumNonUniqueFields> getNonUniqueFields() { std::array<const StateInterface*, kNumNonUniqueFields> constFields = @@ -522,11 +527,12 @@ private: } std::array<const StateInterface*, kNumNonUniqueFields> getNonUniqueFields() const { - return {&mDisplayFrame, &mSourceCrop, &mBufferTransform, &mBlendMode, - &mAlpha, &mLayerMetadata, &mVisibleRegion, &mOutputDataspace, - &mPixelFormat, &mColorTransform, &mCompositionType, &mSidebandStream, - &mBuffer, &mSolidColor, &mBackgroundBlurRadius, &mBlurRegions, - &mFrameNumber, &mIsProtected, &mCachingHint, &mIsDimmingEnabled}; + return {&mDisplayFrame, &mSourceCrop, &mBufferTransform, &mBlendMode, + &mAlpha, &mLayerMetadata, &mVisibleRegion, &mOutputDataspace, + &mPixelFormat, &mColorTransform, &mCompositionType, &mSidebandStream, + &mBuffer, &mSolidColor, &mBackgroundBlurRadius, &mBlurRegions, + &mFrameNumber, &mIsProtected, &mCachingHint, &mIsDimmingEnabled, + &mIsBlursDisabled}; } }; |