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

Commit 2f1aaf7e authored by Chris Craik's avatar Chris Craik
Browse files

updateTexImage before bitmap readback of DeferredLayerUpdaters 

Bug: 34206215
Test: hwui unit tests passing

Change-Id: I4360c0d94a831b4d2ebfd4020e4241658bfa190a
parent 4211358c

libs/hwui/pipeline/skia/SkiaOpenGLPipeline.cpp

+2 −0
Original line number Diff line number Diff line
@@ -128,6 +128,8 @@ bool SkiaOpenGLPipeline::copyLayerInto(DeferredLayerUpdater* deferredLayer, SkBi 
        return false;

    }



    // acquire most recent buffer for drawing

    deferredLayer->updateTexImage();

    deferredLayer->apply();



    SkCanvas canvas(*bitmap);

libs/hwui/renderthread/OpenGLPipeline.cpp

+2 −0
Original line number Diff line number Diff line
@@ -120,6 +120,8 @@ bool OpenGLPipeline::swapBuffers(const Frame& frame, bool drew, const SkRect& sc 


bool OpenGLPipeline::copyLayerInto(DeferredLayerUpdater* layer, SkBitmap* bitmap) {

    ATRACE_CALL();

    // acquire most recent buffer for drawing

    layer->updateTexImage();

    layer->apply();

    return OpenGLReadbackImpl::copyLayerInto(mRenderThread,

            static_cast<GlLayer&>(*layer->backingLayer()), bitmap);