Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fdec7570 authored by Liana Kazanova's avatar Liana Kazanova Committed by Automerger Merge Worker
Browse files

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

Merge "Revert "Fix ping pong progress in the Kawase implementation."" into main am: 0893c1c3 am: 2eba151e

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/3088985



Change-Id: Id5ba97bd15e57a919a8d09d1f5898102bde509e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 75ed01b2 2eba151e

libs/renderengine/skia/filters/KawaseBlurFilter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ sk_sp<SkImage> KawaseBlurFilter::generate(SkiaGpuContext* context, const uint32_ 
        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

+1 −1
Original line number Diff line number Diff line
@@ -1066,7 +1066,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;