Merge "SF: clean up texture filtering logic" (bd6c28dd) · Commits · e / os / android_frameworks_native

services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Output.h

+2 −3

Original line number	Diff line number	Diff line
		@@ -138,7 +138,6 @@ protected:
		std::vector<LayerFE::LayerSettings> generateClientCompositionRequests(
		bool supportsProtectedContent, ui::Dataspace outputDataspace,
		std::vector<LayerFE*>& outLayerFEs) override;
		virtual bool layerNeedsFiltering(const OutputLayer*) const;
		void appendRegionFlashRequests(const Region&, std::vector<LayerFE::LayerSettings>&) override;
		void setExpensiveRenderingExpected(bool enabled) override;
		void setHintSessionGpuFence(std::unique_ptr<FenceTime>&& gpuFence) override;

services/surfaceflinger/CompositionEngine/src/Output.cpp

+1 −5

Original line number	Diff line number	Diff line
		@@ -1438,7 +1438,7 @@ std::vector<LayerFE::LayerSettings> Output::generateClientCompositionRequests(
		Enabled);
		compositionengine::LayerFE::ClientCompositionTargetSettings
		targetSettings{.clip = clip,
		.needsFiltering = layerNeedsFiltering(layer) \|\|
		.needsFiltering = layer->needsFiltering() \|\|
		outputState.needsFiltering,
		.isSecure = outputState.isSecure,
		.supportsProtectedContent = supportsProtectedContent,
		@@ -1469,10 +1469,6 @@ std::vector<LayerFE::LayerSettings> Output::generateClientCompositionRequests(
		return clientCompositionLayers;
		}

		bool Output::layerNeedsFiltering(const compositionengine::OutputLayer* layer) const {
		return layer->needsFiltering();
		}

		void Output::appendRegionFlashRequests(
		const Region& flashRegion, std::vector<LayerFE::LayerSettings>& clientCompositionLayers) {
		if (flashRegion.isEmpty()) {

services/surfaceflinger/DisplayDevice.cpp

+0 −4

Original line number	Diff line number	Diff line
		@@ -347,10 +347,6 @@ const Region& DisplayDevice::getUndefinedRegion() const {
		return mCompositionDisplay->getState().undefinedRegion;
		}

		bool DisplayDevice::needsFiltering() const {
		return mCompositionDisplay->getState().needsFiltering;
		}

		ui::LayerStack DisplayDevice::getLayerStack() const {
		return mCompositionDisplay->getState().layerFilter.layerStack;
		}

services/surfaceflinger/DisplayDevice.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -115,7 +115,6 @@ public:
		const ui::Transform& getTransform() const;
		const Rect& getLayerStackSpaceRect() const;
		const Rect& getOrientedDisplaySpaceRect() const;
		bool needsFiltering() const;
		ui::LayerStack getLayerStack() const;
		bool receivesInput() const { return mFlags & eReceivesInput; }

services/surfaceflinger/DisplayRenderArea.cpp

+3 −27

Original line number	Diff line number	Diff line
		@@ -48,8 +48,8 @@ std::unique_ptr<RenderArea> DisplayRenderArea::create(wp<const DisplayDevice> di
		DisplayRenderArea::DisplayRenderArea(sp<const DisplayDevice> display, const Rect& sourceCrop,
		ui::Size reqSize, ui::Dataspace reqDataSpace,
		bool useIdentityTransform, bool allowSecureLayers)
		: RenderArea(reqSize, CaptureFill::OPAQUE, reqDataSpace, display->getLayerStackSpaceRect(),
		allowSecureLayers, applyDeviceOrientation(useIdentityTransform, *display)),
		: RenderArea(reqSize, CaptureFill::OPAQUE, reqDataSpace, allowSecureLayers,
		applyDeviceOrientation(useIdentityTransform, *display)),
		mDisplay(std::move(display)),
		mSourceCrop(sourceCrop) {}

		@@ -57,18 +57,6 @@ const ui::Transform& DisplayRenderArea::getTransform() const {
		return mTransform;
		}

		Rect DisplayRenderArea::getBounds() const {
		return mDisplay->getBounds();
		}

		int DisplayRenderArea::getHeight() const {
		return mDisplay->getHeight();
		}

		int DisplayRenderArea::getWidth() const {
		return mDisplay->getWidth();
		}

		bool DisplayRenderArea::isSecure() const {
		return mAllowSecureLayers && mDisplay->isSecure();
		}
		@@ -77,18 +65,6 @@ sp<const DisplayDevice> DisplayRenderArea::getDisplayDevice() const {
		return mDisplay;
		}

		bool DisplayRenderArea::needsFiltering() const {
		// check if the projection from the logical render area
		// to the physical render area requires filtering
		const Rect& sourceCrop = getSourceCrop();
		int width = sourceCrop.width();
		int height = sourceCrop.height();
		if (getRotationFlags() & ui::Transform::ROT_90) {
		std::swap(width, height);
		}
		return width != getReqWidth() \|\| height != getReqHeight();
		}

		Rect DisplayRenderArea::getSourceCrop() const {
		// use the projected display viewport by default.
		if (mSourceCrop.isEmpty()) {