Merge "Set visible region dirty flag when alpha changes" into main (14876a1c) · Commits · e / os / android_frameworks_native

libs/gui/include/gui/LayerState.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -277,8 +277,8 @@ struct layer_state_t {
		layer_state_t::eLayerStackChanged;

		// Changes that affect the visible region on a display.
		static constexpr uint64_t VISIBLE_REGION_CHANGES =
		layer_state_t::GEOMETRY_CHANGES \| layer_state_t::HIERARCHY_CHANGES;
		static constexpr uint64_t VISIBLE_REGION_CHANGES = layer_state_t::GEOMETRY_CHANGES \|
		layer_state_t::HIERARCHY_CHANGES \| layer_state_t::eAlphaChanged;

		bool hasValidBuffer() const;
		void sanitize(int32_t permissions);

services/surfaceflinger/FrontEnd/RequestedLayerState.cpp

+1 −2

Original line number	Diff line number	Diff line
		@@ -238,8 +238,7 @@ void RequestedLayerState::merge(const ResolvedComposerState& resolvedComposerSta
		}
		if (what & (layer_state_t::eAlphaChanged)) {
		if (oldAlpha == 0 \|\| color.a == 0) {
		changes \|= RequestedLayerState::Changes::Visibility \|
		RequestedLayerState::Changes::VisibleRegion;
		changes \|= RequestedLayerState::Changes::Visibility;
		}
		}

services/surfaceflinger/tests/unittests/LayerLifecycleManagerTest.cpp

+35 −0

Original line number	Diff line number	Diff line
		@@ -525,4 +525,39 @@ TEST_F(LayerLifecycleManagerTest, roundedCornerChangesSetsVisibilityChangeFlag)
		mLifecycleManager.commitChanges();
		}

		// Even when it does not change visible region, we should mark alpha changes as affecting
		// visible region because HWC impl depends on it. writeOutputIndependentGeometryStateToHWC
		// is only called if we are updating geometry.
		TEST_F(LayerLifecycleManagerTest, alphaChangesAlwaysSetsVisibleRegionFlag) {
		mLifecycleManager.commitChanges();
		float startingAlpha = 0.5f;
		setAlpha(1, startingAlpha);

		// this is expected because layer alpha changes from 1 to 0.5, it may no longer be opaque
		EXPECT_EQ(mLifecycleManager.getGlobalChanges().string(),
		ftl::Flags<RequestedLayerState::Changes>(
		RequestedLayerState::Changes::Content \|
		RequestedLayerState::Changes::AffectsChildren \|
		RequestedLayerState::Changes::VisibleRegion)
		.string());
		EXPECT_EQ(mLifecycleManager.getChangedLayers()[0]->color.a, static_cast<half>(startingAlpha));
		mLifecycleManager.commitChanges();

		float endingAlpha = 0.2f;
		setAlpha(1, endingAlpha);

		// this is not expected but we should make sure this behavior does not change
		EXPECT_EQ(mLifecycleManager.getGlobalChanges().string(),
		ftl::Flags<RequestedLayerState::Changes>(
		RequestedLayerState::Changes::Content \|
		RequestedLayerState::Changes::AffectsChildren \|
		RequestedLayerState::Changes::VisibleRegion)
		.string());
		EXPECT_EQ(mLifecycleManager.getChangedLayers()[0]->color.a, static_cast<half>(endingAlpha));
		mLifecycleManager.commitChanges();

		EXPECT_EQ(mLifecycleManager.getGlobalChanges().string(),
		ftl::Flags<RequestedLayerState::Changes>().string());
		}

		} // namespace android::surfaceflinger::frontend