Merge "Enable single hop screenshots for only threaded re" into main (f4209908) · Commits · e / os / android_frameworks_native

services/surfaceflinger/RegionSamplingThread.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -354,7 +354,7 @@ void RegionSamplingThread::captureSample() {

		FenceResult fenceResult;
		if (FlagManager::getInstance().single_hop_screenshot() &&
		FlagManager::getInstance().ce_fence_promise()) {
		FlagManager::getInstance().ce_fence_promise() && mFlinger.mRenderEngine->isThreaded()) {
		std::vector<sp<LayerFE>> layerFEs;
		auto displayState = mFlinger.getSnapshotsFromMainThread(renderAreaBuilder,
		getLayerSnapshotsFn, layerFEs);

+3 −5

Original line number	Diff line number	Diff line
		@@ -8193,7 +8193,7 @@ void SurfaceFlinger::captureScreenCommon(RenderAreaBuilderVariant renderAreaBuil
		}

		if (FlagManager::getInstance().single_hop_screenshot() &&
		FlagManager::getInstance().ce_fence_promise()) {
		FlagManager::getInstance().ce_fence_promise() && mRenderEngine->isThreaded()) {
		std::vector<sp<LayerFE>> layerFEs;
		auto displayState =
		getSnapshotsFromMainThread(renderAreaBuilder, getLayerSnapshotsFn, layerFEs);
		@@ -8566,10 +8566,8 @@ ftl::SharedFuture<FenceResult> SurfaceFlinger::renderScreenImpl(
		// to CompositionEngine::present.
		ftl::SharedFuture<FenceResult> presentFuture;
		if (FlagManager::getInstance().single_hop_screenshot() &&
		FlagManager::getInstance().ce_fence_promise()) {
		presentFuture = mRenderEngine->isThreaded()
		? ftl::yield(present()).share()
		: mScheduler->schedule(std::move(present)).share();
		FlagManager::getInstance().ce_fence_promise() && mRenderEngine->isThreaded()) {
		presentFuture = ftl::yield(present()).share();
		} else {
		presentFuture = mRenderEngine->isThreaded() ? ftl::defer(std::move(present)).share()
		: ftl::yield(present()).share();