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

Commit f1405186 authored by Chia-I Wu's avatar Chia-I Wu
Browse files

surfaceflinger: add BufferLayerConsumer 

Copied from GLConsumer.{cpp,h}.  Run sed and clang-format on them.
Minor fixes (incorrect header path, already defined macros) to make
them compile.

Make SurfaceFlingerConsumer inherit from BufferLayerConsumer.

Test: boots
Change-Id: I44ef6b15e77fb84b60ab788457a8ed0a1c784a95
parent f49c189d

services/surfaceflinger/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ LOCAL_SRC_FILES := \ 
    GpuService.cpp \

    Layer.cpp \

    BufferLayer.cpp \

    BufferLayerConsumer.cpp \

    ColorLayer.cpp \

    LayerRejecter.cpp \

    LayerVector.cpp \

services/surfaceflinger/BufferLayerConsumer.cpp

0 → 100644
+1104 −0

File added.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/BufferLayerConsumer.h

0 → 100644
+508 −0

File added.

Preview size limit exceeded, changes collapsed.

services/surfaceflinger/SurfaceFlingerConsumer.cpp

+3 −3
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ status_t SurfaceFlingerConsumer::updateTexImage(BufferRejecter* rejecter, 
    Mutex::Autolock lock(mMutex);



    if (mAbandoned) {

        ALOGE("updateTexImage: GLConsumer is abandoned!");

        ALOGE("updateTexImage: BufferLayerConsumer is abandoned!");

        return NO_INIT;

    }
@@ -116,7 +116,7 @@ status_t SurfaceFlingerConsumer::bindTextureImage() 


status_t SurfaceFlingerConsumer::acquireBufferLocked(BufferItem* item,

        nsecs_t presentWhen, uint64_t maxFrameNumber) {

    status_t result = GLConsumer::acquireBufferLocked(item, presentWhen,

    status_t result = BufferLayerConsumer::acquireBufferLocked(item, presentWhen,

            maxFrameNumber);

    if (result == NO_ERROR) {

        mTransformToDisplayInverse = item->mTransformToDisplayInverse;
@@ -190,7 +190,7 @@ sp<Fence> SurfaceFlingerConsumer::getPrevFinalReleaseFence() const { 
void SurfaceFlingerConsumer::setReleaseFence(const sp<Fence>& fence)

{

    if (!mPendingRelease.isPending) {

        GLConsumer::setReleaseFence(fence);

        BufferLayerConsumer::setReleaseFence(fence);

        return;

    }

    auto currentTexture = mPendingRelease.currentTexture;

services/surfaceflinger/SurfaceFlingerConsumer.h

+7 −7

File changed.

Preview size limit exceeded, changes collapsed.