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

Commit 6461806d authored by Courtney Goeltzenleuchter's avatar Courtney Goeltzenleuchter
Browse files

Fix build error from diamond merge 

Somehow between various merges on master and oc-dr1-dev
master ended up in bad state.
CL's involved are:
cd939aa6 Fix build for non-HWC2 targets (master)
281e8113 Communicate composition buffer dataspace to HWC (oc-dr1-dev)
79d27244 Communicate composition buffer dataspace to HWC (master)
I think 281e got merged into master and re-introduced the change that
was fixed by cd93.
Test: make

Change-Id: I087244348392098f516905eb1cebebf0362fcc20
parent 9b67ec1d

services/surfaceflinger/DisplayHardware/FramebufferSurface.cpp

+2 −6
Original line number Original line Diff line number Diff line
@@ -174,6 +174,7 @@ status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>& 
#ifdef USE_HWC2

#ifdef USE_HWC2

    mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,

    mHwcBufferCache.getHwcBuffer(mCurrentBufferSlot, mCurrentBuffer,

            &outSlot, &outBuffer);

            &outSlot, &outBuffer);

    outDataspace = item.mDataSpace;

    status_t result =

    status_t result =

            mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);

            mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);

    if (result != NO_ERROR) {

    if (result != NO_ERROR) {
@@ -183,13 +184,8 @@ status_t FramebufferSurface::nextBuffer(sp<GraphicBuffer>& outBuffer, sp<Fence>& 
#else

#else

    outBuffer = mCurrentBuffer;

    outBuffer = mCurrentBuffer;

#endif

#endif

    status_t result =

            mHwc.setClientTarget(mDisplayType, outSlot, outFence, outBuffer, outDataspace);

    if (result != NO_ERROR) {

        ALOGE("error posting framebuffer: %d", result);

    }





    return result;

    return NO_ERROR;

}

}





#ifndef USE_HWC2

#ifndef USE_HWC2