Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 11:36:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

DisplayDecoration test: destroy layers per display

Browse Source 
This appears to have been broken with
Ic3c0415612b1387671ab8efa0ec95ed727f6bf68, which attempts to destroy
layers for all displays using a single writer. The display command that
destroys a layer must be in the writer for that display, in order for
the displays to run independently. Do so in the test itself, rather than
relying on TearDown to destroy all of them.

Bug: 333974982
Test: atest VtsHalGraphicsComposer3_TargetTest
Flag: TEST_ONLY
Change-Id: Ib6807c85bc6cb32c56cc72126a9fa68363365912
This commit is contained in:
Leon Scroggins III
2024-04-17 14:40:29 -04:00
parent 8392bc6c61
commit c2a83d449c
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/composer/aidl/vts/VtsHalGraphicsComposer3_TargetTest.cpp
View File

@@ -2197,13 +2197,13 @@ TEST_P(GraphicsComposerAidlCommandTest, SetLayerCompositionType) {
TEST_P(GraphicsComposerAidlCommandTest, DisplayDecoration) {
for (VtsDisplay& display : mDisplays) {
auto& writer = getWriter(display.getDisplayId());
const auto displayId = display.getDisplayId();
auto& writer = getWriter(displayId);
const auto [layerStatus, layer] =
mComposerClient->createLayer(display.getDisplayId(), kBufferSlotCount, &writer);
EXPECT_TRUE(layerStatus.isOk());
mComposerClient->createLayer(displayId, kBufferSlotCount, &writer);
ASSERT_TRUE(layerStatus.isOk());
const auto [error, support] =
mComposerClient->getDisplayDecorationSupport(display.getDisplayId());
const auto [error, support] = mComposerClient->getDisplayDecorationSupport(displayId);
const auto format = (error.isOk() && support) ? support->format
: aidl::android::hardware::graphics::common::PixelFormat::RGBA_8888;
@@ -2223,9 +2223,9 @@ TEST_P(GraphicsComposerAidlCommandTest, DisplayDecoration) {
configureLayer(display, layer, Composition::DISPLAY_DECORATION, display.getFrameRect(),
display.getCrop());
writer.setLayerBuffer(display.getDisplayId(), layer, /*slot*/ 0, decorBuffer->handle,
writer.setLayerBuffer(displayId, layer, /*slot*/ 0, decorBuffer->handle,
/*acquireFence*/ -1);
writer.validateDisplay(display.getDisplayId(), ComposerClientWriter::kNoTimestamp,
writer.validateDisplay(displayId, ComposerClientWriter::kNoTimestamp,
VtsComposerClient::kNoFrameIntervalNs);
execute();
if (support) {
@@ -2235,6 +2235,7 @@ TEST_P(GraphicsComposerAidlCommandTest, DisplayDecoration) {
ASSERT_EQ(1, errors.size());
EXPECT_EQ(IComposerClient::EX_UNSUPPORTED, errors[0].errorCode);
}
EXPECT_TRUE(mComposerClient->destroyLayer(displayId, layer, &writer).isOk());
}
}