summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2024-05-14 16:41:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-05-14 16:41:31 +0000
commit922151488d2b316d6400bd1029aa96ad7ebb29bd (patch)
tree81a9a24f341b3f1ba578688e95d31801506c7cd2
parent61d93fc23f1d3d7a34b7b94ada7e77c9133cfba8 (diff)
parenta3e4bf46323f6f019f398354008bc17c0aa36a6f (diff)
downloadnative-922151488d2b316d6400bd1029aa96ad7ebb29bd.tar.gz
Merge "Fix ping pong progress in the Kawase implementation." into main
-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 5c9820cdc5..c528ae9f9d 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 = 1; i < numberOfPasses; i++) {
+ for (auto i = 2; 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 11d4fdebdc..c4c17c200e 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 = 50;
+ auto blurRadius = 30;
auto center = DEFAULT_DISPLAY_WIDTH / 2;
renderengine::DisplaySettings settings;