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

graphics: fix readback buffer tests

Browse Source 
Make readback buffer support optional.  Fix incorrect use of
setReadbackBuffer and getReadbackBufferFence.

Bug:  80030364
Test: VTS
Change-Id: I278a031c3c086ac38c460b7076a2952db57a91a4
Merged-In: I278a031c3c086ac38c460b7076a2952db57a91a4
This commit is contained in:
Chia-I Wu
2018-05-22 10:58:48 -07:00
parent 3fea05cd40
commit 09782444e3
3 changed files with 46 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/composer/2.2/utils/vts/ComposerVts.cpp
View File

@@ -45,6 +45,10 @@ std::unique_ptr<ComposerClient_v2_2> Composer_v2_2::createClient_v2_2() {
return client;
}
sp<V2_2::IComposerClient> ComposerClient_v2_2::getRaw() const {
return mClient_v2_2;
}
std::vector<IComposerClient::PerFrameMetadataKey> ComposerClient_v2_2::getPerFrameMetadataKeys(
Display display) {
std::vector<IComposerClient::PerFrameMetadataKey> keys;

2
graphics/composer/2.2/utils/vts/include/composer-vts/2.2/ComposerVts.h
View File

@@ -63,6 +63,8 @@ class ComposerClient_v2_2
ComposerClient_v2_2(const sp<IComposerClient>& client)
: V2_1::vts::ComposerClient(client), mClient_v2_2(client){};
sp<V2_2::IComposerClient> getRaw() const;
void execute_v2_2(V2_1::vts::TestCommandReader* reader, V2_2::CommandWriterBase* writer);
std::vector<IComposerClient::PerFrameMetadataKey> getPerFrameMetadataKeys(Display display);

48
graphics/composer/2.2/vts/functional/VtsHalGraphicsComposerV2_2TargetTest.cpp
View File

@@ -78,6 +78,11 @@ class GraphicsComposerHidlTest : public ::testing::VtsHalHidlTargetTestBase {
// explicitly disable vsync
mComposerClient->setVsyncEnabled(mPrimaryDisplay, false);
mComposerCallback->setVsyncAllowed(false);
mComposerClient->getRaw()->getReadbackBufferAttributes(
mPrimaryDisplay, [&](const auto& tmpError, const auto&, const auto&) {
mHasReadbackBuffer = tmpError == Error::NONE;
});
}
void TearDown() override {
@@ -96,6 +101,7 @@ class GraphicsComposerHidlTest : public ::testing::VtsHalHidlTargetTestBase {
sp<V2_1::vts::GraphicsComposerCallback> mComposerCallback;
// the first display and is assumed never to be removed
Display mPrimaryDisplay;
bool mHasReadbackBuffer;
private:
Display waitForFirstDisplay() {
@@ -257,18 +263,44 @@ TEST_F(GraphicsComposerHidlTest, setPowerMode_2_2) {
}
TEST_F(GraphicsComposerHidlTest, setReadbackBuffer) {
mComposerClient->setReadbackBuffer(mPrimaryDisplay, nullptr, -1);
}
if (!mHasReadbackBuffer) {
return;
}
TEST_F(GraphicsComposerHidlTest, getReadbackBufferFence) {
int32_t fence;
mComposerClient->getReadbackBufferFence(mPrimaryDisplay, &fence);
}
TEST_F(GraphicsComposerHidlTest, getReadbackBufferAttributes) {
PixelFormat pixelFormat;
Dataspace dataspace;
mComposerClient->getReadbackBufferAttributes(mPrimaryDisplay, &pixelFormat, &dataspace);
ASSERT_LT(static_cast<PixelFormat>(0), pixelFormat);
ASSERT_NE(Dataspace::UNKNOWN, dataspace);
IMapper::BufferDescriptorInfo info{};
Config config = mComposerClient->getActiveConfig(mPrimaryDisplay);
info.width = mComposerClient->getDisplayAttribute(mPrimaryDisplay, config,
IComposerClient::Attribute::WIDTH);
info.height = mComposerClient->getDisplayAttribute(mPrimaryDisplay, config,
IComposerClient::Attribute::HEIGHT);
info.layerCount = 1;
info.format = pixelFormat;
// BufferUsage::COMPOSER_OUTPUT is missing
info.usage = static_cast<uint64_t>(BufferUsage::COMPOSER_OVERLAY | BufferUsage::CPU_READ_OFTEN);
std::unique_ptr<Gralloc> gralloc;
const native_handle_t* buffer;
ASSERT_NO_FATAL_FAILURE(gralloc = std::make_unique<Gralloc>());
ASSERT_NO_FATAL_FAILURE(buffer = gralloc->allocate(info));
mComposerClient->setReadbackBuffer(mPrimaryDisplay, buffer, -1);
}
TEST_F(GraphicsComposerHidlTest, getReadbackBufferFenceInactive) {
if (!mHasReadbackBuffer) {
return;
}
mComposerClient->getRaw()->getReadbackBufferFence(
mPrimaryDisplay, [&](const auto& tmpError, const auto&) {
ASSERT_EQ(Error::UNSUPPORTED, tmpError) << "readback buffer is active";
});
}
/**