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

Commit 5369b769 authored by Chris Craik's avatar Chris Craik
Browse files

resolve merge conflicts of ed211b94 to lmp-mr1-dev-plus-aosp. 

Change-Id: Ib9d6d301282bbaae6b23b9ce07b9e6a4e9075991
parents 16d73a75 ed211b94

libs/hwui/AmbientShadow.cpp

+1 −0
Original line number Diff line number Diff line
@@ -325,6 +325,7 @@ void AmbientShadow::createAmbientShadow(bool isCasterOpaque, 
    // At the end, update the real index and vertex buffer size.

    shadowVertexBuffer.updateVertexCount(vertexBufferIndex);

    shadowVertexBuffer.updateIndexCount(indexBufferIndex);

    shadowVertexBuffer.computeBounds<AlphaVertex>();



    ShadowTessellator::checkOverflow(vertexBufferIndex, totalVertexCount, "Ambient Vertex Buffer");

    ShadowTessellator::checkOverflow(indexBufferIndex, totalIndexCount, "Ambient Index Buffer");

libs/hwui/DisplayList.h

+4 −8
Original line number Diff line number Diff line
@@ -77,18 +77,14 @@ public: 
    OpenGLRenderer& mRenderer;

    const int mReplayFlags;



    // Allocator with the lifetime of a single frame.

    // replay uses an Allocator owned by the struct, while defer shares the DeferredDisplayList's Allocator

    // Allocator with the lifetime of a single frame. replay uses an Allocator owned by the struct,

    // while defer shares the DeferredDisplayList's Allocator

    // TODO: move this allocator to be owned by object with clear frame lifecycle

    LinearAllocator * const mAllocator;



    SkPath* allocPathForFrame() {

        mTempPaths.push_back(SkPath());

        return &mTempPaths.back();

        return mRenderer.allocPathForFrame();

    }



private:

    // Paths kept alive for the duration of the frame

    std::vector<SkPath> mTempPaths;

};



struct DeferStateStruct : public PlaybackStateStruct {

libs/hwui/OpenGLRenderer.cpp

+5 −0
Original line number Diff line number Diff line
@@ -311,6 +311,11 @@ void OpenGLRenderer::finish() { 
    renderOverdraw();

    endTiling();



    for (size_t i = 0; i < mTempPaths.size(); i++) {

        delete mTempPaths[i];

    }

    mTempPaths.clear();



    // When finish() is invoked on FBO 0 we've reached the end

    // of the current frame

    if (getTargetFbo() == 0) {

libs/hwui/OpenGLRenderer.h

+9 −0
Original line number Diff line number Diff line
@@ -342,6 +342,12 @@ public: 
    uint8_t getAmbientShadowAlpha() const { return mAmbientShadowAlpha; }

    uint8_t getSpotShadowAlpha() const { return mSpotShadowAlpha; }



    SkPath* allocPathForFrame() {

        SkPath* path = new SkPath();

        mTempPaths.push_back(path);

        return path;

    }



protected:

    /**

     * Perform the setup specific to a frame. This method does not
@@ -1014,6 +1020,9 @@ private: 
    uint8_t mAmbientShadowAlpha;

    uint8_t mSpotShadowAlpha;



    // Paths kept alive for the duration of the frame

    std::vector<SkPath*> mTempPaths;



    friend class Layer;

    friend class TextSetupFunctor;

    friend class DrawBitmapOp;