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

Commit d101f107 authored by The Android Automerger's avatar The Android Automerger
Browse files

Merge branch 'master' into honeycomb-release

parents 650dd32f 40ca2cb9

include/surfaceflinger/ISurfaceComposer.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -43,6 +43,7 @@ public: 
        eSecure             = 0x00000080,

        eSecure             = 0x00000080,

        eNonPremultiplied   = 0x00000100,

        eNonPremultiplied   = 0x00000100,

        ePushBuffers        = 0x00000200,

        ePushBuffers        = 0x00000200,

        eOpaque             = 0x00000400,





        eFXSurfaceNormal    = 0x00000000,

        eFXSurfaceNormal    = 0x00000000,

        eFXSurfaceBlur      = 0x00010000,

        eFXSurfaceBlur      = 0x00010000,

services/surfaceflinger/Layer.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -171,7 +171,8 @@ status_t Layer::setBuffers( uint32_t w, uint32_t h, 
    mReqHeight = h;

    mReqHeight = h;





    mSecure = (flags & ISurfaceComposer::eSecure) ? true : false;

    mSecure = (flags & ISurfaceComposer::eSecure) ? true : false;

    mNeedsBlending = (info.h_alpha - info.l_alpha) > 0;

    mNeedsBlending = (info.h_alpha - info.l_alpha) > 0 &&

            (flags & ISurfaceComposer::eOpaque) == 0;





    // we use the red index

    // we use the red index

    int displayRedSize = displayInfo.getSize(PixelFormatInfo::INDEX_RED);

    int displayRedSize = displayInfo.getSize(PixelFormatInfo::INDEX_RED);

services/surfaceflinger/LayerBase.cpp

+3 −3
Original line number Original line Diff line number Diff line
@@ -453,11 +453,11 @@ void LayerBase::drawWithOpenGL(const Region& clip, const Texture& texture) const 
    }

    }

    if (transform & HAL_TRANSFORM_FLIP_V) {

    if (transform & HAL_TRANSFORM_FLIP_V) {

        swap(vLT, vLB);

        swap(vLT, vLB);

        swap(vRB, vRT);

        swap(vRT, vRB);

    }

    }

    if (transform & HAL_TRANSFORM_FLIP_H) {

    if (transform & HAL_TRANSFORM_FLIP_H) {

        swap(vLT, vRB);

        swap(vLT, vRT);

        swap(vLB, vRT);

        swap(vLB, vRB);

    }

    }





    TexCoords texCoords[4];

    TexCoords texCoords[4];

services/surfaceflinger/MessageQueue.cpp

+8 −8
Original line number Original line Diff line number Diff line
@@ -72,14 +72,6 @@ sp<MessageBase> MessageQueue::waitMessage(nsecs_t timeout) 
            nsecs_t now = systemTime();

            nsecs_t now = systemTime();

            nsecs_t nextEventTime = -1;

            nsecs_t nextEventTime = -1;





            // invalidate messages are always handled first

            if (mInvalidate) {

                mInvalidate = false;

                mInvalidateMessage->when = now;

                result = mInvalidateMessage;

                break;

            }



            LIST::iterator cur(mMessages.begin());

            LIST::iterator cur(mMessages.begin());

            if (cur != mMessages.end()) {

            if (cur != mMessages.end()) {

                result = *cur;

                result = *cur;
@@ -95,6 +87,14 @@ sp<MessageBase> MessageQueue::waitMessage(nsecs_t timeout) 
                result = 0;

                result = 0;

            }

            }





            // see if we have an invalidate message

            if (mInvalidate) {

                mInvalidate = false;

                mInvalidateMessage->when = now;

                result = mInvalidateMessage;

                break;

            }



            if (timeout >= 0) {

            if (timeout >= 0) {

                if (timeoutTime < now) {

                if (timeoutTime < now) {

                    // we timed-out, return a NULL message

                    // we timed-out, return a NULL message