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

Commit 1e923712 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: 92215148 

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



Change-Id: Ibd62653717502716b8c1d236df52ae25fc84d3cc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cf569d83 92215148

libs/renderengine/skia/filters/KawaseBlurFilter.cpp

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

libs/renderengine/tests/RenderEngineTest.cpp

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