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

Commit 673d1486 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fixed issue where HardwareBufferRenderer was not preserving contents"... 

Merge "Fixed issue where HardwareBufferRenderer was not preserving contents" into udc-dev am: a374e17c

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22295865



Change-Id: I933a59eb6dd7b2c0f57ebf913b83c23d1ada72df
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 990328dc a374e17c

libs/hwui/jni/android_graphics_HardwareBufferRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static long android_graphics_HardwareBufferRenderer_create(JNIEnv* env, jobject, 
    auto* hardwareBuffer = HardwareBufferHelpers::AHardwareBuffer_fromHardwareBuffer(env, buffer);

    auto* rootRenderNode = reinterpret_cast<RootRenderNode*>(renderNodePtr);

    ContextFactoryImpl factory(rootRenderNode);

    auto* proxy = new RenderProxy(true, rootRenderNode, &factory);

    auto* proxy = new RenderProxy(false, rootRenderNode, &factory);

    proxy->setHardwareBuffer(hardwareBuffer);

    return (jlong)proxy;

}

libs/hwui/pipeline/skia/SkiaPipeline.cpp

+1 −2
Original line number Diff line number Diff line
@@ -499,8 +499,7 @@ void SkiaPipeline::renderFrameImpl(const SkRect& clip, 
    }

    canvas->concat(preTransform);



    // STOPSHIP: Revert, temporary workaround to clear always F16 frame buffer for b/74976293

    if (!opaque || getSurfaceColorType() == kRGBA_F16_SkColorType) {

    if (!opaque) {

        canvas->clear(SK_ColorTRANSPARENT);

    }