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

Commit 4fc2fd3c authored by Andreas Gampe's avatar Andreas Gampe Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 1d03b816 to lmp-mr1-dev-plus-aosp"

parents e9157de2 edaecc1d

libs/hwui/AmbientShadow.cpp

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ inline void computeBufferSize(int* totalVertexCount, int* totalIndexCount, 
    *totalUmbraCount = 0;

    if (!isCasterOpaque) {

        // Add the centroid if occluder is translucent.

        *totalVertexCount++;

        (*totalVertexCount)++;

        *totalIndexCount += 2 * innerVertexCount + 1;

        *totalUmbraCount = innerVertexCount;

    }

libs/hwui/Android.mk

+94 −91
Original line number Diff line number Diff line
@@ -106,12 +106,15 @@ ifeq ($(USE_OPENGL_RENDERER),true) 
    endif



    ifdef HWUI_COMPILE_FOR_PERF

        # TODO: Non-arm?

        LOCAL_CFLAGS += -fno-omit-frame-pointer -marm -mapcs

    endif



    # Defaults for ATRACE_TAG and LOG_TAG for libhwui

    LOCAL_CFLAGS += -DATRACE_TAG=ATRACE_TAG_VIEW -DLOG_TAG=\"OpenGLRenderer\"



    LOCAL_CFLAGS += -Wall -Werror -Wunused -Wunreachable-code



    include external/stlport/libstlport.mk

    include $(BUILD_SHARED_LIBRARY)

libs/hwui/DeferredDisplayList.cpp

+1 −3
Original line number Diff line number Diff line
@@ -310,7 +310,7 @@ private: 
class RestoreToCountBatch : public Batch {

public:

    RestoreToCountBatch(const StateOp* op, const DeferredDisplayState* state, int restoreCount) :

            mOp(op), mState(state), mRestoreCount(restoreCount) {}

            mState(state), mRestoreCount(restoreCount) {}



    virtual void replay(OpenGLRenderer& renderer, Rect& dirty, int index) {

        DEFER_LOGD("batch %p restoring to count %d", this, mRestoreCount);
@@ -321,7 +321,6 @@ public: 


private:

    // we use the state storage for the RestoreToCountOp, but don't replay the op itself

    const StateOp* mOp;

    const DeferredDisplayState* mState;



    /*
@@ -669,7 +668,6 @@ void DeferredDisplayList::discardDrawingBatches(const unsigned int maxIndex) { 
    for (unsigned int i = mEarliestUnclearedIndex; i <= maxIndex; i++) {

        // leave deferred state ops alone for simplicity (empty save restore pairs may now exist)

        if (mBatches[i] && mBatches[i]->purelyDrawBatch()) {

            DrawBatch* b = (DrawBatch*) mBatches[i];

            delete mBatches[i];

            mBatches.replaceAt(NULL, i);

        }

libs/hwui/DeferredDisplayList.h

+1 −1
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ public: 
};



class DeferredDisplayList {

    friend class DeferStateStruct; // used to give access to allocator

    friend struct DeferStateStruct; // used to give access to allocator

public:

    DeferredDisplayList(const Rect& bounds) :

            mBounds(bounds) {

libs/hwui/DisplayList.h

+1 −2
Original line number Diff line number Diff line
@@ -92,8 +92,7 @@ private: 
    std::vector<SkPath> mTempPaths;

};



class DeferStateStruct : public PlaybackStateStruct {

public:

struct DeferStateStruct : public PlaybackStateStruct {

    DeferStateStruct(DeferredDisplayList& deferredList, OpenGLRenderer& renderer, int replayFlags)

            : PlaybackStateStruct(renderer, replayFlags, &(deferredList.mAllocator)),

            mDeferredList(deferredList) {}