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

Commit 42ddc18d authored by Andreas Gampe's avatar Andreas Gampe
Browse files

Frameworks/base: Unused parameters in hwui 

Remove Clang cutout for unused parameters. Fix warnings.

Remove Clang cutout for deprecated Skia function usage. Has been
fixed in the L push.

Change-Id: I7ea073ff67127cc1e14e798b655e2c50615fe8e7
parent f926d71b

libs/hwui/Android.mk

+0 −2
Original line number Diff line number Diff line
@@ -6,8 +6,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk 
# getConfig in external/skia/include/core/SkBitmap.h is deprecated.

# Allow Gnu extension: in-class initializer of static 'const float' member.

LOCAL_CLANG_CFLAGS += \

    -Wno-unused-parameter \

    -Wno-deprecated-declarations \

    -Wno-gnu-static-float-init



# Only build libhwui when USE_OPENGL_RENDERER is

libs/hwui/AnimationContext.cpp

+1 −1
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ void AnimationContext::addAnimationHandle(AnimationHandle* handle) { 
    handle->insertAfter(&mNextFrameAnimations);

}



void AnimationContext::startFrame(TreeInfo::TraversalMode mode) {

void AnimationContext::startFrame(TreeInfo::TraversalMode /* mode */) {

    LOG_ALWAYS_FATAL_IF(mCurrentFrameAnimations.mNextHandle,

            "Missed running animations last frame!");

    AnimationHandle* head = mNextFrameAnimations.mNextHandle;

libs/hwui/Animator.cpp

+4 −4
Original line number Diff line number Diff line
@@ -245,11 +245,11 @@ CanvasPropertyPrimitiveAnimator::CanvasPropertyPrimitiveAnimator( 
        , mProperty(property) {

}



float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* target) const {

float CanvasPropertyPrimitiveAnimator::getValue(RenderNode* /* target */) const {

    return mProperty->value;

}



void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* target, float value) {

void CanvasPropertyPrimitiveAnimator::setValue(RenderNode* /* target */, float value) {

    mProperty->value = value;

}
@@ -268,7 +268,7 @@ CanvasPropertyPaintAnimator::CanvasPropertyPaintAnimator( 
        , mField(field) {

}



float CanvasPropertyPaintAnimator::getValue(RenderNode* target) const {

float CanvasPropertyPaintAnimator::getValue(RenderNode* /* target */) const {

    switch (mField) {

    case STROKE_WIDTH:

        return mProperty->value.getStrokeWidth();
@@ -284,7 +284,7 @@ static uint8_t to_uint8(float value) { 
    return static_cast<uint8_t>( c < 0 ? 0 : c > 255 ? 255 : c );

}



void CanvasPropertyPaintAnimator::setValue(RenderNode* target, float value) {

void CanvasPropertyPaintAnimator::setValue(RenderNode* /* target */, float value) {

    switch (mField) {

    case STROKE_WIDTH:

        mProperty->value.setStrokeWidth(value);

libs/hwui/Caches.h

+5 −5
Original line number Diff line number Diff line
@@ -385,13 +385,13 @@ private: 


    bool bindIndicesBufferInternal(const GLuint buffer);



    static void eventMarkNull(GLsizei length, const GLchar* marker) { }

    static void startMarkNull(GLsizei length, const GLchar* marker) { }

    static void eventMarkNull(GLsizei /* length */, const GLchar* /* marker */) { }

    static void startMarkNull(GLsizei /* length */, const GLchar* /* marker */) { }

    static void endMarkNull() { }



    static void setLabelNull(GLenum type, uint object, GLsizei length,

            const char* label) { }

    static void getLabelNull(GLenum type, uint object, GLsizei bufferSize,

    static void setLabelNull(GLenum /* type */, uint /* object */, GLsizei /* length */,

            const char* /* label */) { }

    static void getLabelNull(GLenum /* type */, uint /* object */, GLsizei /* bufferSize */,

            GLsizei* length, char* label) {

        if (length) *length = 0;

        if (label) *label = '\0';

libs/hwui/DeferredDisplayList.cpp

+7 −7
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ public: 
    virtual status_t replay(OpenGLRenderer& renderer, Rect& dirty, int index) = 0;

    virtual ~Batch() {}

    virtual bool purelyDrawBatch() { return false; }

    virtual bool coversBounds(const Rect& bounds) { return false; }

    virtual bool coversBounds(const Rect& /* bounds */) { return false; }

};



class DrawBatch : public Batch {
@@ -91,7 +91,7 @@ public: 
        return false;

    }



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

    virtual status_t replay(OpenGLRenderer& renderer, Rect& dirty, int /* index */) {

        DEFER_LOGD("%d  replaying DrawBatch %p, with %d ops (batch id %x, merge id %p)",

                index, this, mOps.size(), getBatchId(), getMergeId());
@@ -269,7 +269,7 @@ public: 
        if (newClipSideFlags & kClipSide_Bottom) mClipRect.bottom = state->mClip.bottom;

    }



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

    virtual status_t replay(OpenGLRenderer& renderer, Rect& dirty, int /* index */) {

        DEFER_LOGD("%d  replaying MergingDrawBatch %p, with %d ops,"

                " clip flags %x (batch id %x, merge id %p)",

                index, this, mOps.size(), mClipSideFlags, getBatchId(), getMergeId());
@@ -313,7 +313,7 @@ public: 
    // creates a single operation batch

    StateOpBatch(const StateOp* op, const DeferredDisplayState* state) : mOp(op), mState(state) {}



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

    virtual status_t replay(OpenGLRenderer& renderer, Rect& /* dirty */, int /* index */) {

        DEFER_LOGD("replaying state op batch %p", this);

        renderer.restoreDisplayState(*mState);
@@ -332,10 +332,10 @@ private: 


class RestoreToCountBatch : public Batch {

public:

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

            mState(state), mRestoreCount(restoreCount) {}

    RestoreToCountBatch(const StateOp* /* op */, const DeferredDisplayState* state,

                        int restoreCount) : mState(state), mRestoreCount(restoreCount) {}



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

    virtual status_t replay(OpenGLRenderer& renderer, Rect& /* dirty */, int /* index */) {

        DEFER_LOGD("batch %p restoring to count %d", this, mRestoreCount);



        renderer.restoreDisplayState(*mState);