diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-19 02:15:38 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2021-07-19 02:15:38 +0000 |
| commit | 67619bdd9d8b1d79b9fe70b40555dbac42711543 (patch) | |
| tree | 4f78b826244adbfe6b36ea8eadd0512fb8d514c8 | |
| parent | 642879a7daff87e374c24e8198e59ab200d9a36a (diff) | |
| parent | b9d529ba488a72125df06327da00798c23c98471 (diff) | |
| download | native-67619bdd9d8b1d79b9fe70b40555dbac42711543.tar.gz | |
Snap for 7560886 from b9d529ba488a72125df06327da00798c23c98471 to sc-mainline-release
Change-Id: I50f13ea762a9e965fa7587f7b4eb7182e14866fa
| -rw-r--r-- | libs/gui/Surface.cpp | 1 | ||||
| -rw-r--r-- | libs/renderengine/skia/filters/BlurFilter.h | 2 | ||||
| -rw-r--r-- | services/surfaceflinger/Layer.cpp | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/libs/gui/Surface.cpp b/libs/gui/Surface.cpp index 821ec16eb1..2edb4e4ba4 100644 --- a/libs/gui/Surface.cpp +++ b/libs/gui/Surface.cpp @@ -70,6 +70,7 @@ Surface::Surface(const sp<IGraphicBufferProducer>& bufferProducer, bool controll mGenerationNumber(0), mSharedBufferMode(false), mAutoRefresh(false), + mAutoPrerotation(false), mSharedBufferSlot(BufferItem::INVALID_BUFFER_SLOT), mSharedBufferHasBeenQueued(false), mQueriedSupportedTimestamps(false), diff --git a/libs/renderengine/skia/filters/BlurFilter.h b/libs/renderengine/skia/filters/BlurFilter.h index a8e6dd7579..7110018367 100644 --- a/libs/renderengine/skia/filters/BlurFilter.h +++ b/libs/renderengine/skia/filters/BlurFilter.h @@ -42,7 +42,7 @@ public: static constexpr uint32_t kMaxPasses = 4; // To avoid downscaling artifacts, we interpolate the blurred fbo with the full composited // image, up to this radius. - static constexpr float kMaxCrossFadeRadius = 30.0f; + static constexpr float kMaxCrossFadeRadius = 10.0f; explicit BlurFilter(); virtual ~BlurFilter(){}; diff --git a/services/surfaceflinger/Layer.cpp b/services/surfaceflinger/Layer.cpp index bbe2c3e575..e2b6a36794 100644 --- a/services/surfaceflinger/Layer.cpp +++ b/services/surfaceflinger/Layer.cpp @@ -958,7 +958,6 @@ bool Layer::setTransparentRegionHint(const Region& transparent) { } bool Layer::setBlurRegions(const std::vector<BlurRegion>& blurRegions) { - mDrawingState.sequence++; mDrawingState.blurRegions = blurRegions; mDrawingState.modified = true; setTransactionFlags(eTransactionNeeded); |