Commit 28b5bb19 authored Feb 24, 2025 by YCairn Overturf

Fix virtual display screenshot test on tangor

The test was failing because tangor's default orientation is not 0 and the test harness was creating a rotated projection.

Before:

Summary (Test executed with 1 devices.)
-------
arm64-v8a SurfaceFlinger_test:SurfaceFlinger_test: Passed: 293, Failed: 74, Ignored: 10, Assumption Failed: 0

74 tests failed
---------------
LayerCallbackTest#SetNullBuffer
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetPositionBasic_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetPositionRounding_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetPositionOutOfBounds_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetPositionPartiallyOutOfBounds_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetRelativeZBasic_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetRelativeZBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetRelativeZGroup_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetRelativeZGroup_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetTransparentRegionHintBasic_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetTransparentRegionHintBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetTransparentRegionHintOutOfBounds_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetTransparentRegionHintOutOfBounds_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetAlphaBasic_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetAlphaBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetColorBasic/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetColorClamped/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetInvalidColor/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetColorWithAlpha/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetColorWithParentAlpha_Bug74220420/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetMatrixBasic_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetMatrixBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetMatrixRot45_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropBasic_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropEmpty_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropEmpty_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropOutOfBounds_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropOutOfBounds_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropWithTranslation_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropWithTranslation_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetCropWithScale_BufferQueue/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFrameBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFrameEmpty_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFrameDefaultParentless_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFrameDefaultBSParent_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFrameDefaultBQParent_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFrameUpdate_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFrameOutsideBounds_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetBufferBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetBufferMultipleBuffers_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetBufferMultipleLayers_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetBufferCaching_LeastRecentlyUsed_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetTransformRotate90_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetTransformFlipH_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetTransformFlipV_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetFenceNull_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetDataspaceBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetHdrMetadataBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetSurfaceDamageRegionBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetApiBasic_BufferState/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetColorTransformBasic/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetColorTransformOnParent/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetColorTransformOnChildAndParent/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetNullBuffer/0
LayerRenderTypeTransactionTests/LayerRenderTypeTransactionTest#SetNullBufferOnLayerWithoutBuffer/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetZBasic/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetRelativeZBug64572777/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetFlagsHidden/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetFlagsOpaque/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetZNegative/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetAlphaClamped/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetCornerRadius/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetCornerRadiusInvalidCrop/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetCornerRadiusRotated/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetCornerRadiusChildCrop/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetCornerRadiusBufferRotationTransform/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetCornerRadiusBufferCropTransform/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetCornerRadiusChildBufferRotationTransform/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#ChildCornerRadiusTakesPrecedence/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#ParentCornerRadiusTakesPrecedence/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetClientDrawnCornerRadius/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetColorWithBuffer/0
LayerTypeAndRenderTypeTransactionTests/LayerTypeAndRenderTypeTransactionTest#SetLayerStackBasic/0

After:

Summary (Test executed with 1 devices.)
-------
arm64-v8a SurfaceFlinger_test:SurfaceFlinger_test: Passed: 366, Failed: 1, Ignored: 10, Assumption Failed: 0

1 test failed
-------------
LayerCallbackTest#SetNullBuffer
Test Result uploaded to http://ab/I69400010369779850

Bug: None
Test: atest SurfaceFlinger_test
Flag: EXEMPT bug fix
Change-Id: I43581d664f8477fd29036f066177e128e8b9f300

parent 4a902602

services/surfaceflinger/tests/TransactionTestHarnesses.h

+7 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,11 @@ public:

		ui::DisplayMode displayMode;
		SurfaceComposerClient::getActiveDisplayMode(displayToken, &displayMode);
		const ui::Size& resolution = displayMode.resolution;
		ui::Size resolution = displayMode.resolution;
		if (displayState.orientation == ui::Rotation::Rotation90 \|\|
		displayState.orientation == ui::Rotation::Rotation270) {
		std::swap(resolution.width, resolution.height);
		}

		sp<IBinder> vDisplay;

		@@ -93,8 +97,8 @@ public:
		#else
		t.setDisplaySurface(vDisplay, producer);
		#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)
		t.setDisplayProjection(vDisplay, displayState.orientation,
		Rect(displayState.layerStackSpaceRect), Rect(resolution));
		t.setDisplayProjection(vDisplay, ui::Rotation::Rotation0, Rect(resolution),
		Rect(resolution));
		t.setDisplayLayerStack(vDisplay, layerStack);
		t.setLayerStack(mirrorSc, layerStack);
		t.apply();