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

Commit f2a4f9af authored by John Reck's avatar John Reck Committed by Android (Google) Code Review
Browse files

Merge "Fix copyLayerInto"

parents 5bf536cf 0b8d0677

libs/hwui/BakedOpRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ void BakedOpRenderer::startRepaintLayer(OffscreenBuffer* offscreenBuffer, const 
    mRenderTarget.offscreenBuffer = offscreenBuffer;



    // create and bind framebuffer

    mRenderTarget.frameBufferId = mRenderState.genFramebuffer();

    mRenderTarget.frameBufferId = mRenderState.createFramebuffer();

    mRenderState.bindFramebuffer(mRenderTarget.frameBufferId);



    // attach the texture to the FBO

libs/hwui/LayerRenderer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ Layer* LayerRenderer::createRenderLayer(RenderState& renderState, uint32_t width 
    LAYER_RENDERER_LOGD("Requesting new render layer %dx%d", width, height);



    Caches& caches = Caches::getInstance();

    GLuint fbo = renderState.genFramebuffer();

    GLuint fbo = renderState.createFramebuffer();

    if (!fbo) {

        ALOGW("Could not obtain an FBO");

        return nullptr;
@@ -357,7 +357,7 @@ bool LayerRenderer::copyLayer(RenderState& renderState, Layer* layer, SkBitmap* 
            && bitmap->width() <= caches.maxTextureSize

            && bitmap->height() <= caches.maxTextureSize) {



        GLuint fbo = renderState.getFramebuffer();

        GLuint fbo = renderState.createFramebuffer();

        if (!fbo) {

            ALOGW("Could not obtain an FBO");

            return false;

libs/hwui/OpenGLRenderer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -674,7 +674,7 @@ bool OpenGLRenderer::createLayer(float left, float top, float right, float botto 


bool OpenGLRenderer::createFboLayer(Layer* layer, Rect& bounds, Rect& clip) {

    layer->clipRect.set(clip);

    layer->setFbo(mRenderState.genFramebuffer());

    layer->setFbo(mRenderState.createFramebuffer());



    writableSnapshot()->region = &writableSnapshot()->layer->region;

    writableSnapshot()->flags |= Snapshot::kFlagFboTarget | Snapshot::kFlagIsFboLayer;

libs/hwui/renderstate/RenderState.cpp

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ void RenderState::bindFramebuffer(GLuint fbo) { 
    }

}



GLuint RenderState::genFramebuffer() {

GLuint RenderState::createFramebuffer() {

    GLuint ret;

    glGenFramebuffers(1, &ret);

    return ret;

libs/hwui/renderstate/RenderState.h

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ public: 


    void bindFramebuffer(GLuint fbo);

    GLuint getFramebuffer() { return mFramebuffer; }

    GLuint genFramebuffer();

    GLuint createFramebuffer();

    void deleteFramebuffer(GLuint fbo);



    void invokeFunctor(Functor* functor, DrawGlInfo::Mode mode, DrawGlInfo* info);