Merge "SF: populate state correctly in Display::applyLayerRequestsToLayers" into sc-dev (6383bb05) · Commits · e / devices / smdk4412 / android_frameworks_native

services/surfaceflinger/CompositionEngine/src/Display.cpp

+2 −2

Original line number	Diff line number	Diff line
		@@ -344,8 +344,8 @@ void Display::applyClientTargetRequests(const ClientTargetProperty& clientTarget
		if (clientTargetProperty.dataspace == ui::Dataspace::UNKNOWN) {
		return;
		}
		auto outputState = editState();
		outputState.dataspace = clientTargetProperty.dataspace;

		editState().dataspace = clientTargetProperty.dataspace;
		getRenderSurface()->setBufferDataspace(clientTargetProperty.dataspace);
		getRenderSurface()->setBufferPixelFormat(clientTargetProperty.pixelFormat);
		}

+23 −0

Original line number	Diff line number	Diff line
		@@ -846,6 +846,29 @@ TEST_F(DisplayApplyLayerRequestsToLayersTest, appliesDeviceLayerRequests) {
		});
		}

		/*
		* Display::applyClientTargetRequests()
		*/

		using DisplayApplyClientTargetRequests = DisplayWithLayersTestCommon;

		TEST_F(DisplayApplyLayerRequestsToLayersTest, applyClientTargetRequests) {
		Display::ClientTargetProperty clientTargetProperty = {
		.pixelFormat = hal::PixelFormat::RGB_565,
		.dataspace = hal::Dataspace::STANDARD_BT470M,
		};

		mock::RenderSurface* renderSurface = new StrictMock<mock::RenderSurface>();
		mDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));

		EXPECT_CALL(*renderSurface, setBufferPixelFormat(clientTargetProperty.pixelFormat));
		EXPECT_CALL(*renderSurface, setBufferDataspace(clientTargetProperty.dataspace));
		mDisplay->applyClientTargetRequests(clientTargetProperty);

		auto& state = mDisplay->getState();
		EXPECT_EQ(clientTargetProperty.dataspace, state.dataspace);
		}

		/*
		* Display::presentAndGetFrameFences()
		*/