Remove deprecated BufferQueue constructor (b9b08837) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/Android.mk

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -11,9 +11,9 @@ LOCAL_SRC_FILES:= \
	Layer.cpp \		Layer.cpp \
	LayerDim.cpp \		LayerDim.cpp \
	MessageQueue.cpp \		MessageQueue.cpp \
			MonitoredProducer.cpp \
	SurfaceFlinger.cpp \		SurfaceFlinger.cpp \
	SurfaceFlingerConsumer.cpp \		SurfaceFlingerConsumer.cpp \
	SurfaceTextureLayer.cpp \
	Transform.cpp \		Transform.cpp \
	DisplayHardware/FramebufferSurface.cpp \		DisplayHardware/FramebufferSurface.cpp \
	DisplayHardware/HWComposer.cpp \		DisplayHardware/HWComposer.cpp \

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.cpp

+4 −3

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

	VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc, int32_t dispId,		VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc, int32_t dispId,
	const sp<IGraphicBufferProducer>& sink,		const sp<IGraphicBufferProducer>& sink,
	const sp<BufferQueue>& bq,		const sp<IGraphicBufferProducer>& bqProducer,
			const sp<IGraphicBufferConsumer>& bqConsumer,
	const String8& name)		const String8& name)
	: ConsumerBase(bq),		: ConsumerBase(bqConsumer),
	mHwc(hwc),		mHwc(hwc),
	mDisplayId(dispId),		mDisplayId(dispId),
	mDisplayName(name),		mDisplayName(name),
	@@ -60,7 +61,7 @@ VirtualDisplaySurface::VirtualDisplaySurface(HWComposer& hwc, int32_t dispId,
	mMustRecompose(false)		mMustRecompose(false)
	{		{
	mSource[SOURCE_SINK] = sink;		mSource[SOURCE_SINK] = sink;
	mSource[SOURCE_SCRATCH] = bq;		mSource[SOURCE_SCRATCH] = bqProducer;

	resetPerFrameState();		resetPerFrameState();

services/surfaceflinger/DisplayHardware/VirtualDisplaySurface.h

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -73,7 +73,8 @@ class VirtualDisplaySurface : public DisplaySurface,
	public:		public:
	VirtualDisplaySurface(HWComposer& hwc, int32_t dispId,		VirtualDisplaySurface(HWComposer& hwc, int32_t dispId,
	const sp<IGraphicBufferProducer>& sink,		const sp<IGraphicBufferProducer>& sink,
	const sp<BufferQueue>& bq,		const sp<IGraphicBufferProducer>& bqProducer,
			const sp<IGraphicBufferConsumer>& bqConsumer,
	const String8& name);		const String8& name);

	//		//

services/surfaceflinger/Layer.cpp

+8 −5

Original line number	Original line	Diff line number	Diff line
	@@ -40,8 +40,8 @@
	#include "Colorizer.h"		#include "Colorizer.h"
	#include "DisplayDevice.h"		#include "DisplayDevice.h"
	#include "Layer.h"		#include "Layer.h"
			#include "MonitoredProducer.h"
	#include "SurfaceFlinger.h"		#include "SurfaceFlinger.h"
	#include "SurfaceTextureLayer.h"

	#include "DisplayHardware/HWComposer.h"		#include "DisplayHardware/HWComposer.h"

	@@ -117,8 +117,11 @@ Layer::Layer(SurfaceFlinger* flinger, const sp<Client>& client,

	void Layer::onFirstRef() {		void Layer::onFirstRef() {
	// Creates a custom BufferQueue for SurfaceFlingerConsumer to use		// Creates a custom BufferQueue for SurfaceFlingerConsumer to use
	mBufferQueue = new SurfaceTextureLayer(mFlinger);		sp<BnGraphicBufferProducer> producer;
	mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(mBufferQueue, mTextureName);		sp<BnGraphicBufferConsumer> consumer;
			BufferQueue::createBufferQueue(&producer, &consumer);
			mProducer = new MonitoredProducer(producer, mFlinger);
			mSurfaceFlingerConsumer = new SurfaceFlingerConsumer(consumer, mTextureName);
	mSurfaceFlingerConsumer->setConsumerUsageBits(getEffectiveUsage(0));		mSurfaceFlingerConsumer->setConsumerUsageBits(getEffectiveUsage(0));
	mSurfaceFlingerConsumer->setContentsChangedListener(this);		mSurfaceFlingerConsumer->setContentsChangedListener(this);
	mSurfaceFlingerConsumer->setName(mName);		mSurfaceFlingerConsumer->setName(mName);
	@@ -236,8 +239,8 @@ sp<IBinder> Layer::getHandle() {
	return new Handle(mFlinger, this);		return new Handle(mFlinger, this);
	}		}

	sp<IGraphicBufferProducer> Layer::getBufferQueue() const {		sp<IGraphicBufferProducer> Layer::getProducer() const {
	return mBufferQueue;		return mProducer;
	}		}

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

services/surfaceflinger/Layer.h

+3 −3

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

	#include "FrameTracker.h"		#include "FrameTracker.h"
	#include "Client.h"		#include "Client.h"
			#include "MonitoredProducer.h"
	#include "SurfaceFlinger.h"		#include "SurfaceFlinger.h"
	#include "SurfaceFlingerConsumer.h"		#include "SurfaceFlingerConsumer.h"
	#include "SurfaceTextureLayer.h"
	#include "Transform.h"		#include "Transform.h"

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

	sp<IBinder> getHandle();		sp<IBinder> getHandle();
	sp<IGraphicBufferProducer> getBufferQueue() const;		sp<IGraphicBufferProducer> getProducer() const;
	const String8& getName() const;		const String8& getName() const;

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

	// constants		// constants
	sp<SurfaceFlingerConsumer> mSurfaceFlingerConsumer;		sp<SurfaceFlingerConsumer> mSurfaceFlingerConsumer;
	sp<BufferQueue> mBufferQueue;		sp<IGraphicBufferProducer> mProducer;
	uint32_t mTextureName;		uint32_t mTextureName;
	bool mPremultipliedAlpha;		bool mPremultipliedAlpha;
	String8 mName;		String8 mName;