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

Commit e319cc6b authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Reduce number of copies into unmapExternalTextureBuffer" into udc-dev

parents d046f988 92f89fa2

libs/renderengine/ExternalTexture.cpp

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ ExternalTexture::ExternalTexture(const sp<GraphicBuffer>& buffer, 
}



ExternalTexture::~ExternalTexture() {

    mRenderEngine.unmapExternalTextureBuffer(mBuffer);

    mRenderEngine.unmapExternalTextureBuffer(std::move(mBuffer));

}



} // namespace android::renderengine::impl

libs/renderengine/gl/GLESRenderEngine.cpp

+2 −2
Original line number Diff line number Diff line
@@ -800,7 +800,7 @@ status_t GLESRenderEngine::cacheExternalTextureBufferInternal(const sp<GraphicBu 
    return NO_ERROR;

}



void GLESRenderEngine::unmapExternalTextureBuffer(const sp<GraphicBuffer>& buffer) {

void GLESRenderEngine::unmapExternalTextureBuffer(sp<GraphicBuffer>&& buffer) {

    mImageManager->releaseAsync(buffer->getId(), nullptr);

}
@@ -1262,7 +1262,7 @@ void GLESRenderEngine::drawLayersInternal( 


            // Do not cache protected EGLImage, protected memory is limited.

            if (gBuf->getUsage() & GRALLOC_USAGE_PROTECTED) {

                unmapExternalTextureBuffer(gBuf);

                unmapExternalTextureBuffer(std::move(gBuf));

            }

        }

libs/renderengine/gl/GLESRenderEngine.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ protected: 
    size_t getMaxViewportDims() const override;

    void mapExternalTextureBuffer(const sp<GraphicBuffer>& buffer, bool isRenderable)

            EXCLUDES(mRenderingMutex);

    void unmapExternalTextureBuffer(const sp<GraphicBuffer>& buffer) EXCLUDES(mRenderingMutex);

    void unmapExternalTextureBuffer(sp<GraphicBuffer>&& buffer) EXCLUDES(mRenderingMutex);

    bool canSkipPostRenderCleanup() const override;

    void drawLayersInternal(const std::shared_ptr<std::promise<FenceResult>>&& resultPromise,

                            const DisplaySettings& display,

libs/renderengine/include/renderengine/RenderEngine.h

+1 −1
Original line number Diff line number Diff line
@@ -231,7 +231,7 @@ protected: 
    // asynchronously, but the caller can expect that map/unmap calls are performed in a manner

    // that's conflict serializable, i.e. unmap a buffer should never occur before binding the

    // buffer if the caller called mapExternalTextureBuffer before calling unmap.

    virtual void unmapExternalTextureBuffer(const sp<GraphicBuffer>& buffer) = 0;

    virtual void unmapExternalTextureBuffer(sp<GraphicBuffer>&& buffer) = 0;



    // A thread safe query to determine if any post rendering cleanup is necessary.  Returning true

    // is a signal that calling the postRenderCleanup method would be a no-op and that callers can

libs/renderengine/include/renderengine/mock/RenderEngine.h

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

    // mock renderengine still needs to implement these, but callers should never need to call them.

    void mapExternalTextureBuffer(const sp<GraphicBuffer>&, bool) {}

    void unmapExternalTextureBuffer(const sp<GraphicBuffer>&) {}

    void unmapExternalTextureBuffer(sp<GraphicBuffer>&&) {}

};



} // namespace mock