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

Commit 02ab322c authored by Dan Stoza's avatar Dan Stoza Committed by Android (Google) Code Review
Browse files

Merge "Remove deprecated BufferQueue constructor"

parents 8ce5c1cc b9b08837

services/surfaceflinger/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ LOCAL_SRC_FILES:= \ 
    Layer.cpp \

    LayerDim.cpp \

    MessageQueue.cpp \

    MonitoredProducer.cpp \

    SurfaceFlinger.cpp \

    SurfaceFlingerConsumer.cpp \

    SurfaceTextureLayer.cpp \

    Transform.cpp \

    DisplayHardware/FramebufferSurface.cpp \

    DisplayHardware/HWComposer.cpp \

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+4 −3
Original line number Diff line number Diff line
@@ -47,9 +47,10 @@ static const char* dbgCompositionTypeStr(DisplaySurface::CompositionType type) { 


VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc, int32_t dispId,

        const sp<IGraphicBufferProducer>& sink,

        const sp<BufferQueue>& bq,

        const sp<IGraphicBufferProducer>& bqProducer,

        const sp<IGraphicBufferConsumer>& bqConsumer,

        const String8& name)

:   ConsumerBase(bq),

:   ConsumerBase(bqConsumer),

    mHwc(hwc),

    mDisplayId(dispId),

    mDisplayName(name),
@@ -60,7 +61,7 @@ VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc, int32_t dispId, 
    mMustRecompose(false)

{

    mSource[SOURCE_SINK] = sink;

    mSource[SOURCE_SCRATCH] = bq;

    mSource[SOURCE_SCRATCH] = bqProducer;



    resetPerFrameState();

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h

+2 −1
Original line number Diff line number Diff line
@@ -73,7 +73,8 @@ class VirtualDisplaySurface : public DisplaySurface, 
public:

    VirtualDisplaySurface(HWComposer& hwc, int32_t dispId,

            const sp<IGraphicBufferProducer>& sink,

            const sp<BufferQueue>& bq,

            const sp<IGraphicBufferProducer>& bqProducer,

            const sp<IGraphicBufferConsumer>& bqConsumer,

            const String8& name);



    //

services/surfaceflinger/Layer.cpp

+8 −5
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ 
#include "Colorizer.h"

#include "DisplayDevice.h"

#include "Layer.h"

#include "MonitoredProducer.h"

#include "SurfaceFlinger.h"

#include "SurfaceTextureLayer.h"



#include "DisplayHardware/HWComposer.h"
@@ -117,8 +117,11 @@ Layer::Layer(SurfaceFlinger* flinger, const sp<Client>& client, 


void Layer::onFirstRef() {

    // Creates a custom BufferQueue for SurfaceFlingerConsumer to use

    mBufferQueue = new SurfaceTextureLayer(mFlinger);

    mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(mBufferQueue, mTextureName);

    sp<BnGraphicBufferProducer> producer;

    sp<BnGraphicBufferConsumer> consumer;

    BufferQueue::createBufferQueue(&producer, &consumer);

    mProducer = new MonitoredProducer(producer, mFlinger);

    mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(consumer, mTextureName);

    mSurfaceFlingerConsumer->setConsumerUsageBits(getEffectiveUsage(0));

    mSurfaceFlingerConsumer->setContentsChangedListener(this);

    mSurfaceFlingerConsumer->setName(mName);
@@ -236,8 +239,8 @@ sp<IBinder> Layer::getHandle() { 
    return new Handle(mFlinger, this);

}



sp<IGraphicBufferProducer> Layer::getBufferQueue() const {

    return mBufferQueue;

sp<IGraphicBufferProducer> Layer::getProducer() const {

    return mProducer;

}



// ---------------------------------------------------------------------------

services/surfaceflinger/Layer.h

+3 −3
Original line number Diff line number Diff line
@@ -37,9 +37,9 @@ 


#include "FrameTracker.h"

#include "Client.h"

#include "MonitoredProducer.h"

#include "SurfaceFlinger.h"

#include "SurfaceFlingerConsumer.h"

#include "SurfaceTextureLayer.h"

#include "Transform.h"



#include "DisplayHardware/HWComposer.h"
@@ -140,7 +140,7 @@ public: 
    Rect computeBounds() const;



    sp<IBinder> getHandle();

    sp<IGraphicBufferProducer> getBufferQueue() const;

    sp<IGraphicBufferProducer> getProducer() const;

    const String8& getName() const;



    // -----------------------------------------------------------------------
@@ -338,7 +338,7 @@ private: 


    // constants

    sp<SurfaceFlingerConsumer> mSurfaceFlingerConsumer;

    sp<BufferQueue> mBufferQueue;

    sp<IGraphicBufferProducer> mProducer;

    uint32_t mTextureName;

    bool mPremultipliedAlpha;

    String8 mName;