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

Commit bebdf4e5 authored by Leon Scroggins's avatar Leon Scroggins Committed by Automerger Merge Worker
Browse files

Merge "Fix ping pong progress in the Kawase implementation." into main am:... 

Merge "Fix ping pong progress in the Kawase implementation." into main am: 92215148 am: 1e923712

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



Change-Id: I3940dc1ecdfc01fbd199656491677968990ecc44
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cfbee530 1e923712

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 = 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);

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 = 50;

    auto blurRadius = 30;

    auto center = DEFAULT_DISPLAY_WIDTH / 2;



    renderengine::DisplaySettings settings;