Skip to content

Commit 28b5bb1

Browse files
committed
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
1 parent 4a90260 commit 28b5bb1

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

services/surfaceflinger/tests/TransactionTestHarnesses.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,11 @@ class LayerRenderPathTestHarness {
4848

4949
ui::DisplayMode displayMode;
5050
SurfaceComposerClient::getActiveDisplayMode(displayToken, &displayMode);
51-
const ui::Size& resolution = displayMode.resolution;
51+
ui::Size resolution = displayMode.resolution;
52+
if (displayState.orientation == ui::Rotation::Rotation90 ||
53+
displayState.orientation == ui::Rotation::Rotation270) {
54+
std::swap(resolution.width, resolution.height);
55+
}
5256

5357
sp<IBinder> vDisplay;
5458

@@ -93,8 +97,8 @@ class LayerRenderPathTestHarness {
9397
#else
9498
t.setDisplaySurface(vDisplay, producer);
9599
#endif // COM_ANDROID_GRAPHICS_LIBGUI_FLAGS(WB_CONSUMER_BASE_OWNS_BQ)
96-
t.setDisplayProjection(vDisplay, displayState.orientation,
97-
Rect(displayState.layerStackSpaceRect), Rect(resolution));
100+
t.setDisplayProjection(vDisplay, ui::Rotation::Rotation0, Rect(resolution),
101+
Rect(resolution));
98102
t.setDisplayLayerStack(vDisplay, layerStack);
99103
t.setLayerStack(mirrorSc, layerStack);
100104
t.apply();

0 commit comments

Comments
 (0)