commit 2db35e7cd3b7e1e7c467c184e6fca297c84bac6b
author Alec Mouri <alecmouri@google.com> Wed May 15 14:03:56 2024 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed May 15 14:03:56 2024 +0000
tree df58352644f038900ad2267c31177cb05048b9fc
parent a3e4bf46323f6f019f398354008bc17c0aa36a6f

Revert "Fix ping pong progress in the Kawase implementation."

This reverts commit a3e4bf46323f6f019f398354008bc17c0aa36a6f.

Reason for revert: b/340625902

Change-Id: I537c5d88fa5368b37713618239603ce8e28463d9

libs/renderengine/skia/filters/KawaseBlurFilter.cpp

diff --git a/libs/renderengine/skia/filters/KawaseBlurFilter.cpp b/libs/renderengine/skia/filters/KawaseBlurFilter.cpp
index c528ae9..5c9820c 100644
--- a/libs/renderengine/skia/filters/KawaseBlurFilter.cpp
+++ b/libs/renderengine/skia/filters/KawaseBlurFilter.cpp
@@ -126,7 +126,7 @@
         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);

libs/renderengine/tests/RenderEngineTest.cpp

diff --git a/libs/renderengine/tests/RenderEngineTest.cpp b/libs/renderengine/tests/RenderEngineTest.cpp
index c4c17c2..11d4fde 100644
--- a/libs/renderengine/tests/RenderEngineTest.cpp
+++ b/libs/renderengine/tests/RenderEngineTest.cpp
@@ -1095,7 +1095,7 @@
 
 template <typename SourceVariant>
 void RenderEngineTest::fillBufferAndBlurBackground() {
-    auto blurRadius = 30;
+    auto blurRadius = 50;
     auto center = DEFAULT_DISPLAY_WIDTH / 2;
 
     renderengine::DisplaySettings settings;