Merge "SF: Create layers with layerid" (3704e31f) · Commits · e / os / platform_frameworks_native

services/surfaceflinger/BufferQueueLayer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -523,7 +523,7 @@ void BufferQueueLayer::gatherBufferInfo() {
		}

		sp<Layer> BufferQueueLayer::createClone() {
		LayerCreationArgs args(mFlinger.get(), nullptr, mName + " (Mirror)", 0, 0, 0, LayerMetadata());
		LayerCreationArgs args(mFlinger.get(), nullptr, mName + " (Mirror)", 0, LayerMetadata());
		args.textureName = mTextureName;
		sp<BufferQueueLayer> layer = mFlinger->getFactory().createBufferQueueLayer(args);
		layer->setInitialValuesForClone(this);

services/surfaceflinger/BufferQueueLayer.h

+5 −0

Original line number	Diff line number	Diff line
		@@ -62,6 +62,11 @@ public:
		status_t setDefaultBufferProperties(uint32_t w, uint32_t h, PixelFormat format);
		sp<IGraphicBufferProducer> getProducer() const;

		void setSizeForTest(uint32_t w, uint32_t h) {
		mDrawingState.active_legacy.w = w;
		mDrawingState.active_legacy.h = h;
		}

		protected:
		void gatherBufferInfo() override;

services/surfaceflinger/BufferStateLayer.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -883,7 +883,7 @@ Rect BufferStateLayer::computeBufferCrop(const State& s) {
		}

		sp<Layer> BufferStateLayer::createClone() {
		LayerCreationArgs args(mFlinger.get(), nullptr, mName + " (Mirror)", 0, 0, 0, LayerMetadata());
		LayerCreationArgs args(mFlinger.get(), nullptr, mName + " (Mirror)", 0, LayerMetadata());
		args.textureName = mTextureName;
		sp<BufferStateLayer> layer = mFlinger->getFactory().createBufferStateLayer(args);
		layer->mHwcSlotGenerator = mHwcSlotGenerator;

services/surfaceflinger/Client.cpp

+19 −26

Original line number	Diff line number	Diff line
		@@ -72,37 +72,30 @@ sp<Layer> Client::getLayerUser(const sp<IBinder>& handle) const
		return lbc;
		}

		status_t Client::createSurface(const String8& name, uint32_t w, uint32_t h, PixelFormat format,
		uint32_t flags, const sp<IBinder>& parentHandle,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint) {
		status_t Client::createSurface(const String8& name, uint32_t /* w /, uint32_t / h */,
		PixelFormat /* format */, uint32_t flags,
		const sp<IBinder>& parentHandle, LayerMetadata metadata,
		sp<IBinder>* outHandle, sp<IGraphicBufferProducer>* /* gbp */,
		int32_t* outLayerId, uint32_t* outTransformHint) {
		// We rely on createLayer to check permissions.
		return mFlinger->createLayer(name, this, w, h, format, flags, std::move(metadata), handle, gbp,
		parentHandle, outLayerId, nullptr, outTransformHint);
		}

		status_t Client::createWithSurfaceParent(const String8& name, uint32_t w, uint32_t h,
		PixelFormat format, uint32_t flags,
		const sp<IGraphicBufferProducer>& parent,
		LayerMetadata metadata, sp<IBinder>* handle,
		sp<IGraphicBufferProducer>* gbp, int32_t* outLayerId,
		uint32_t* outTransformHint) {
		if (mFlinger->authenticateSurfaceTexture(parent) == false) {
		ALOGE("failed to authenticate surface texture");
		return BAD_VALUE;
		}

		const auto& layer = (static_cast<MonitoredProducer*>(parent.get()))->getLayer();
		if (layer == nullptr) {
		ALOGE("failed to find parent layer");
		LayerCreationArgs args(mFlinger.get(), this, name.c_str(), flags, std::move(metadata));
		return mFlinger->createLayer(args, outHandle, parentHandle, outLayerId, nullptr,
		outTransformHint);
		}

		status_t Client::createWithSurfaceParent(const String8& /* name /, uint32_t / w */,
		uint32_t /* h /, PixelFormat / format */,
		uint32_t /* flags */,
		const sp<IGraphicBufferProducer>& /* parent */,
		LayerMetadata /* metadata /, sp<IBinder> /* handle */,
		sp<IGraphicBufferProducer>* /* gbp */,
		int32_t* /* outLayerId */,
		uint32_t* /* outTransformHint */) {
		// This api does not make sense with blast since SF no longer tracks IGBP. This api should be
		// removed.
		return BAD_VALUE;
		}

		return mFlinger->createLayer(name, this, w, h, format, flags, std::move(metadata), handle, gbp,
		nullptr, outLayerId, layer, outTransformHint);
		}

		status_t Client::mirrorSurface(const sp<IBinder>& mirrorFromHandle, sp<IBinder>* outHandle,
		int32_t* outLayerId) {
		return mFlinger->mirrorLayer(this, mirrorFromHandle, outHandle, outLayerId);

services/surfaceflinger/ContainerLayer.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -36,8 +36,7 @@ bool ContainerLayer::isVisible() const {

		sp<Layer> ContainerLayer::createClone() {
		sp<ContainerLayer> layer = mFlinger->getFactory().createContainerLayer(
		LayerCreationArgs(mFlinger.get(), nullptr, mName + " (Mirror)", 0, 0, 0,
		LayerMetadata()));
		LayerCreationArgs(mFlinger.get(), nullptr, mName + " (Mirror)", 0, LayerMetadata()));
		layer->setInitialValuesForClone(this);
		return layer;
		}