summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2024-05-16 01:26:16 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-16 01:26:16 +0000
commit74acfde8297f83c1fcfce0bde08d0607c825ed1d (patch)
treeb8c67a2ca0844b1358dd1de35f49892152a1998c
parentd5b54aa9c808c76cef3475c639d8b91c15c86a9d (diff)
parent58a9f96e369ffc959faeee497500adba32065ed4 (diff)
downloadnative-74acfde8297f83c1fcfce0bde08d0607c825ed1d.tar.gz
Merge "Snap for 11847757 from 0893c1c3c5b7b926022ad7d4d02bfac00a904b52 to sdk-release" into sdk-release
-rw-r--r--libs/renderengine/skia/filters/KawaseBlurFilter.cpp2
-rw-r--r--libs/renderengine/tests/RenderEngineTest.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/libs/renderengine/skia/filters/KawaseBlurFilter.cpp b/libs/renderengine/skia/filters/KawaseBlurFilter.cpp
index c528ae9f9d..5c9820cdc5 100644
--- a/libs/renderengine/skia/filters/KawaseBlurFilter.cpp
+++ b/libs/renderengine/skia/filters/KawaseBlurFilter.cpp
@@ -126,7 +126,7 @@ sk_sp<SkImage> KawaseBlurFilter::generate(GrRecordingContext* context,
surfaceTwo = surface->makeSurface(scaledInfo);
LOG_ALWAYS_FATAL_IF(!surfaceTwo, "%s: Failed to create second blur surface!", __func__);
- for (auto i = 2; i <= numberOfPasses; i++) {
+ for (auto i = 1; i < numberOfPasses; i++) {
LOG_ALWAYS_FATAL_IF(tmpBlur == nullptr, "%s: tmpBlur is null for pass %d", __func__, i);
blurBuilder.child("child") =
tmpBlur->makeShader(SkTileMode::kClamp, SkTileMode::kClamp, linear);
diff --git a/libs/renderengine/tests/RenderEngineTest.cpp b/libs/renderengine/tests/RenderEngineTest.cpp
index c4c17c200e..11d4fdebdc 100644
--- a/libs/renderengine/tests/RenderEngineTest.cpp
+++ b/libs/renderengine/tests/RenderEngineTest.cpp
@@ -1095,7 +1095,7 @@ void RenderEngineTest::fillBufferWithRoundedCorners() {
template <typename SourceVariant>
void RenderEngineTest::fillBufferAndBlurBackground() {
- auto blurRadius = 30;
+ auto blurRadius = 50;
auto center = DEFAULT_DISPLAY_WIDTH / 2;
renderengine::DisplaySettings settings;