SF: Extract virtual display allocation from CE
Allocate HAL virtual display and generate HAL/GPU virtual display ID in
SF rather than CE. This centralizes the HAL vs. GPU decision as a first
step in isolating display configuration (e.g. hotplug, modeset) to be a
distinct stage from invalidate/refresh.
Rework SF backend hooks for screen capture. Plumb the PhysicalDisplayId
to be mirrored by the virtual display to Composer::createVirtualDisplay.
This enables the ARC backend to know which display to mirror (instead of
making assumptions about the layer stack) or error out if not mirroring
(previously done through maybeAllocateDisplayIdForVirtualDisplay), such
that SF falls back to creating a GPU virtual display.
Bug: 182939859
Bug: 129481165
Test: Enable overlay display and toggle HAL/GPU
Test: libsurfaceflinger_unittest
Test: libcompositionengine_test
Change-Id: I209b245966e544d5ff55d5d118140cfcfa85db15
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayCreationArgs.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayCreationArgs.h
index 317d333..526e7da 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayCreationArgs.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/DisplayCreationArgs.h
@@ -21,13 +21,10 @@
#include <string>
#include <ui/DisplayId.h>
-#include <ui/PixelFormat.h>
#include <ui/Size.h>
#include <ui/StaticDisplayInfo.h>
-#include "DisplayHardware/DisplayIdentification.h"
#include "DisplayHardware/PowerAdvisor.h"
-#include "DisplayIdGenerator.h"
namespace android::compositionengine {
@@ -37,24 +34,14 @@
* A parameter object for creating Display instances
*/
struct DisplayCreationArgs {
- struct Physical {
- DisplayId id;
- ui::DisplayConnectionType type;
- };
+ DisplayId id;
- // Required for physical displays. Gives the HWC display id for the existing
- // display along with the connection type.
- std::optional<Physical> physical;
+ // Unset for virtual displays
+ std::optional<ui::DisplayConnectionType> connectionType;
// Size of the display in pixels
ui::Size pixels = ui::kInvalidSize;
- // Pixel format of the display
- ui::PixelFormat pixelFormat = static_cast<ui::PixelFormat>(PIXEL_FORMAT_UNKNOWN);
-
- // True if virtual displays should be created with the HWC API if possible
- bool useHwcVirtualDisplays = false;
-
// True if this display should be considered secure
bool isSecure = false;
@@ -67,9 +54,6 @@
// Debugging. Human readable name for the display.
std::string name;
-
- // Generator for IDs of virtual displays, which are backed by the GPU.
- DisplayIdGenerator<GpuVirtualDisplayId>* gpuVirtualDisplayIdGenerator;
};
/**
@@ -80,8 +64,13 @@
public:
DisplayCreationArgs build() { return std::move(mArgs); }
- DisplayCreationArgsBuilder& setPhysical(DisplayCreationArgs::Physical physical) {
- mArgs.physical = physical;
+ DisplayCreationArgsBuilder& setId(DisplayId id) {
+ mArgs.id = id;
+ return *this;
+ }
+
+ DisplayCreationArgsBuilder& setConnectionType(ui::DisplayConnectionType connectionType) {
+ mArgs.connectionType = connectionType;
return *this;
}
@@ -90,22 +79,6 @@
return *this;
}
- DisplayCreationArgsBuilder& setPixelFormat(ui::PixelFormat pixelFormat) {
- mArgs.pixelFormat = pixelFormat;
- return *this;
- }
-
- DisplayCreationArgsBuilder& setUseHwcVirtualDisplays(bool useHwcVirtualDisplays) {
- mArgs.useHwcVirtualDisplays = useHwcVirtualDisplays;
- return *this;
- }
-
- DisplayCreationArgsBuilder& setGpuVirtualDisplayIdGenerator(
- DisplayIdGenerator<GpuVirtualDisplayId>& generator) {
- mArgs.gpuVirtualDisplayIdGenerator = &generator;
- return *this;
- }
-
DisplayCreationArgsBuilder& setIsSecure(bool isSecure) {
mArgs.isSecure = isSecure;
return *this;
diff --git a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
index 54e91ae..bb540ea 100644
--- a/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
+++ b/services/surfaceflinger/CompositionEngine/include/compositionengine/impl/Display.h
@@ -80,19 +80,13 @@
// Internal
virtual void setConfiguration(const compositionengine::DisplayCreationArgs&);
- virtual std::optional<DisplayId> maybeAllocateDisplayIdForVirtualDisplay(ui::Size,
- ui::PixelFormat) const;
std::unique_ptr<compositionengine::OutputLayer> createOutputLayer(const sp<LayerFE>&) const;
- // Testing
- void setDisplayIdForTesting(DisplayId displayId);
-
private:
bool mIsVirtual = false;
bool mIsDisconnected = false;
DisplayId mId;
Hwc2::PowerAdvisor* mPowerAdvisor = nullptr;
- DisplayIdGenerator<GpuVirtualDisplayId>* mGpuVirtualDisplayIdGenerator;
};
// This template factory function standardizes the implementation details of the
diff --git a/services/surfaceflinger/CompositionEngine/src/Display.cpp b/services/surfaceflinger/CompositionEngine/src/Display.cpp
index 1ffb1c8..7d84cb5 100644
--- a/services/surfaceflinger/CompositionEngine/src/Display.cpp
+++ b/services/surfaceflinger/CompositionEngine/src/Display.cpp
@@ -50,36 +50,14 @@
Display::~Display() = default;
void Display::setConfiguration(const compositionengine::DisplayCreationArgs& args) {
- mIsVirtual = !args.physical;
+ mId = args.id;
+ mIsVirtual = !args.connectionType;
mPowerAdvisor = args.powerAdvisor;
editState().isSecure = args.isSecure;
editState().displaySpace.bounds = Rect(args.pixels);
setLayerStackFilter(args.layerStackId,
- args.physical &&
- args.physical->type == ui::DisplayConnectionType::Internal);
+ args.connectionType == ui::DisplayConnectionType::Internal);
setName(args.name);
- mGpuVirtualDisplayIdGenerator = args.gpuVirtualDisplayIdGenerator;
-
- if (args.physical) {
- mId = args.physical->id;
- } else {
- std::optional<DisplayId> id;
- if (args.useHwcVirtualDisplays) {
- id = maybeAllocateDisplayIdForVirtualDisplay(args.pixels, args.pixelFormat);
- }
- if (!id) {
- id = mGpuVirtualDisplayIdGenerator->nextId();
- }
- LOG_ALWAYS_FATAL_IF(!id, "Failed to generate display ID");
- mId = *id;
- }
-}
-
-std::optional<DisplayId> Display::maybeAllocateDisplayIdForVirtualDisplay(
- ui::Size pixels, ui::PixelFormat pixelFormat) const {
- auto& hwc = getCompositionEngine().getHwComposer();
- return hwc.allocateVirtualDisplay(static_cast<uint32_t>(pixels.width),
- static_cast<uint32_t>(pixels.height), &pixelFormat);
}
bool Display::isValid() const {
@@ -102,23 +80,16 @@
return mId;
}
-void Display::setDisplayIdForTesting(DisplayId displayId) {
- mId = displayId;
-}
-
void Display::disconnect() {
if (mIsDisconnected) {
return;
}
mIsDisconnected = true;
- if (const auto id = GpuVirtualDisplayId::tryCast(mId)) {
- mGpuVirtualDisplayIdGenerator->markUnused(*id);
- return;
+
+ if (const auto id = HalDisplayId::tryCast(mId)) {
+ getCompositionEngine().getHwComposer().disconnectDisplay(*id);
}
- const auto halDisplayId = HalDisplayId::tryCast(mId);
- LOG_FATAL_IF(!halDisplayId);
- getCompositionEngine().getHwComposer().disconnectDisplay(*halDisplayId);
}
void Display::setColorTransform(const compositionengine::CompositionRefreshArgs& args) {
diff --git a/services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp b/services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp
index 492db43..5c9421b 100644
--- a/services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp
+++ b/services/surfaceflinger/CompositionEngine/tests/DisplayTest.cpp
@@ -14,10 +14,6 @@
* limitations under the License.
*/
-// TODO(b/129481165): remove the #pragma below and fix conversion issues
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wextra"
-
#include <cmath>
#include <compositionengine/DisplayColorProfileCreationArgs.h>
@@ -60,13 +56,12 @@
using testing::SetArgPointee;
using testing::StrictMock;
-constexpr PhysicalDisplayId DEFAULT_DISPLAY_ID = PhysicalDisplayId::fromPort(42u);
-// TODO(b/160679868) Use VirtualDisplayId
-constexpr PhysicalDisplayId VIRTUAL_DISPLAY_ID = PhysicalDisplayId::fromPort(43u);
+constexpr PhysicalDisplayId DEFAULT_DISPLAY_ID = PhysicalDisplayId::fromPort(123u);
+constexpr HalVirtualDisplayId HAL_VIRTUAL_DISPLAY_ID{456u};
+constexpr GpuVirtualDisplayId GPU_VIRTUAL_DISPLAY_ID{789u};
-constexpr int32_t DEFAULT_DISPLAY_WIDTH = 1920;
-constexpr int32_t DEFAULT_DISPLAY_HEIGHT = 1080;
-constexpr int32_t DEFAULT_LAYER_STACK = 123;
+constexpr ui::Size DEFAULT_RESOLUTION{1920, 1080};
+constexpr uint32_t DEFAULT_LAYER_STACK = 42;
struct Layer {
Layer() {
@@ -95,8 +90,6 @@
public:
using impl::Display::injectOutputLayerForTest;
virtual void injectOutputLayerForTest(std::unique_ptr<compositionengine::OutputLayer>) = 0;
-
- using impl::Display::maybeAllocateDisplayIdForVirtualDisplay;
};
// Uses a special implementation with key internal member functions set up
@@ -170,21 +163,19 @@
DisplayCreationArgs getDisplayCreationArgsForPhysicalHWCDisplay() {
return DisplayCreationArgsBuilder()
- .setPhysical({DEFAULT_DISPLAY_ID, ui::DisplayConnectionType::Internal})
- .setPixels({DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT})
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
+ .setId(DEFAULT_DISPLAY_ID)
+ .setConnectionType(ui::DisplayConnectionType::Internal)
+ .setPixels(DEFAULT_RESOLUTION)
.setIsSecure(true)
.setLayerStackId(DEFAULT_LAYER_STACK)
.setPowerAdvisor(&mPowerAdvisor)
.build();
}
- DisplayCreationArgs getDisplayCreationArgsForNonHWCVirtualDisplay() {
+ DisplayCreationArgs getDisplayCreationArgsForGpuVirtualDisplay() {
return DisplayCreationArgsBuilder()
- .setUseHwcVirtualDisplays(false)
- .setGpuVirtualDisplayIdGenerator(mGpuDisplayIdGenerator)
- .setPixels({DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT})
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
+ .setId(GPU_VIRTUAL_DISPLAY_ID)
+ .setPixels(DEFAULT_RESOLUTION)
.setIsSecure(false)
.setLayerStackId(DEFAULT_LAYER_STACK)
.setPowerAdvisor(&mPowerAdvisor)
@@ -196,7 +187,6 @@
StrictMock<renderengine::mock::RenderEngine> mRenderEngine;
StrictMock<mock::CompositionEngine> mCompositionEngine;
sp<mock::NativeWindow> mNativeWindow = new StrictMock<mock::NativeWindow>();
- RandomDisplayIdGenerator<GpuVirtualDisplayId> mGpuDisplayIdGenerator;
};
struct PartialMockDisplayTestCommon : public DisplayTestCommon {
@@ -248,9 +238,9 @@
EXPECT_EQ(DEFAULT_DISPLAY_ID, display->getId());
}
-TEST_F(DisplayCreationTest, createNonHwcVirtualDisplay) {
- auto display = impl::createDisplay(mCompositionEngine,
- getDisplayCreationArgsForNonHWCVirtualDisplay());
+TEST_F(DisplayCreationTest, createGpuVirtualDisplay) {
+ auto display =
+ impl::createDisplay(mCompositionEngine, getDisplayCreationArgsForGpuVirtualDisplay());
EXPECT_FALSE(display->isSecure());
EXPECT_TRUE(display->isVirtual());
EXPECT_TRUE(GpuVirtualDisplayId::tryCast(display->getId()));
@@ -263,17 +253,15 @@
using DisplaySetConfigurationTest = PartialMockDisplayTestCommon;
TEST_F(DisplaySetConfigurationTest, configuresInternalSecurePhysicalDisplay) {
- mDisplay->setConfiguration(
- DisplayCreationArgsBuilder()
- .setUseHwcVirtualDisplays(true)
- .setPhysical({DEFAULT_DISPLAY_ID, ui::DisplayConnectionType::Internal})
- .setPixels(ui::Size(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_WIDTH))
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
- .setIsSecure(true)
- .setLayerStackId(DEFAULT_LAYER_STACK)
- .setPowerAdvisor(&mPowerAdvisor)
- .setName(getDisplayNameFromCurrentTest())
- .build());
+ mDisplay->setConfiguration(DisplayCreationArgsBuilder()
+ .setId(DEFAULT_DISPLAY_ID)
+ .setConnectionType(ui::DisplayConnectionType::Internal)
+ .setPixels(DEFAULT_RESOLUTION)
+ .setIsSecure(true)
+ .setLayerStackId(DEFAULT_LAYER_STACK)
+ .setPowerAdvisor(&mPowerAdvisor)
+ .setName(getDisplayNameFromCurrentTest())
+ .build());
EXPECT_EQ(DEFAULT_DISPLAY_ID, mDisplay->getId());
EXPECT_TRUE(mDisplay->isSecure());
@@ -284,17 +272,15 @@
}
TEST_F(DisplaySetConfigurationTest, configuresExternalInsecurePhysicalDisplay) {
- mDisplay->setConfiguration(
- DisplayCreationArgsBuilder()
- .setUseHwcVirtualDisplays(true)
- .setPhysical({DEFAULT_DISPLAY_ID, ui::DisplayConnectionType::External})
- .setPixels(ui::Size(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_WIDTH))
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
- .setIsSecure(false)
- .setLayerStackId(DEFAULT_LAYER_STACK)
- .setPowerAdvisor(&mPowerAdvisor)
- .setName(getDisplayNameFromCurrentTest())
- .build());
+ mDisplay->setConfiguration(DisplayCreationArgsBuilder()
+ .setId(DEFAULT_DISPLAY_ID)
+ .setConnectionType(ui::DisplayConnectionType::External)
+ .setPixels(DEFAULT_RESOLUTION)
+ .setIsSecure(false)
+ .setLayerStackId(DEFAULT_LAYER_STACK)
+ .setPowerAdvisor(&mPowerAdvisor)
+ .setName(getDisplayNameFromCurrentTest())
+ .build());
EXPECT_EQ(DEFAULT_DISPLAY_ID, mDisplay->getId());
EXPECT_FALSE(mDisplay->isSecure());
@@ -304,25 +290,17 @@
EXPECT_FALSE(mDisplay->isValid());
}
-TEST_F(DisplaySetConfigurationTest, configuresHwcBackedVirtualDisplay) {
- EXPECT_CALL(mHwComposer,
- allocateVirtualDisplay(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_WIDTH,
- Pointee(Eq(static_cast<ui::PixelFormat>(
- PIXEL_FORMAT_RGBA_8888)))))
- .WillOnce(Return(VIRTUAL_DISPLAY_ID));
+TEST_F(DisplaySetConfigurationTest, configuresHalVirtualDisplay) {
+ mDisplay->setConfiguration(DisplayCreationArgsBuilder()
+ .setId(HAL_VIRTUAL_DISPLAY_ID)
+ .setPixels(DEFAULT_RESOLUTION)
+ .setIsSecure(false)
+ .setLayerStackId(DEFAULT_LAYER_STACK)
+ .setPowerAdvisor(&mPowerAdvisor)
+ .setName(getDisplayNameFromCurrentTest())
+ .build());
- mDisplay->setConfiguration(
- DisplayCreationArgsBuilder()
- .setUseHwcVirtualDisplays(true)
- .setPixels(ui::Size(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_WIDTH))
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
- .setIsSecure(false)
- .setLayerStackId(DEFAULT_LAYER_STACK)
- .setPowerAdvisor(&mPowerAdvisor)
- .setName(getDisplayNameFromCurrentTest())
- .build());
-
- EXPECT_EQ(VIRTUAL_DISPLAY_ID, mDisplay->getId());
+ EXPECT_EQ(HAL_VIRTUAL_DISPLAY_ID, mDisplay->getId());
EXPECT_FALSE(mDisplay->isSecure());
EXPECT_TRUE(mDisplay->isVirtual());
EXPECT_EQ(DEFAULT_LAYER_STACK, mDisplay->getState().layerStackId);
@@ -330,47 +308,17 @@
EXPECT_FALSE(mDisplay->isValid());
}
-TEST_F(DisplaySetConfigurationTest, configuresNonHwcBackedVirtualDisplayIfHwcAllocationFails) {
- EXPECT_CALL(mHwComposer,
- allocateVirtualDisplay(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_WIDTH,
- Pointee(Eq(static_cast<ui::PixelFormat>(
- PIXEL_FORMAT_RGBA_8888)))))
- .WillOnce(Return(std::nullopt));
+TEST_F(DisplaySetConfigurationTest, configuresGpuVirtualDisplay) {
+ mDisplay->setConfiguration(DisplayCreationArgsBuilder()
+ .setId(GPU_VIRTUAL_DISPLAY_ID)
+ .setPixels(DEFAULT_RESOLUTION)
+ .setIsSecure(false)
+ .setLayerStackId(DEFAULT_LAYER_STACK)
+ .setPowerAdvisor(&mPowerAdvisor)
+ .setName(getDisplayNameFromCurrentTest())
+ .build());
- mDisplay->setConfiguration(
- DisplayCreationArgsBuilder()
- .setUseHwcVirtualDisplays(true)
- .setGpuVirtualDisplayIdGenerator(mGpuDisplayIdGenerator)
- .setPixels(ui::Size(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_WIDTH))
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
- .setIsSecure(false)
- .setLayerStackId(DEFAULT_LAYER_STACK)
- .setPowerAdvisor(&mPowerAdvisor)
- .setName(getDisplayNameFromCurrentTest())
- .build());
-
- EXPECT_TRUE(GpuVirtualDisplayId::tryCast(mDisplay->getId()));
- EXPECT_FALSE(mDisplay->isSecure());
- EXPECT_TRUE(mDisplay->isVirtual());
- EXPECT_EQ(DEFAULT_LAYER_STACK, mDisplay->getState().layerStackId);
- EXPECT_FALSE(mDisplay->getState().layerStackInternal);
- EXPECT_FALSE(mDisplay->isValid());
-}
-
-TEST_F(DisplaySetConfigurationTest, configuresNonHwcBackedVirtualDisplayIfShouldNotUseHwc) {
- mDisplay->setConfiguration(
- DisplayCreationArgsBuilder()
- .setUseHwcVirtualDisplays(false)
- .setGpuVirtualDisplayIdGenerator(mGpuDisplayIdGenerator)
- .setPixels(ui::Size(DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_WIDTH))
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
- .setIsSecure(false)
- .setLayerStackId(DEFAULT_LAYER_STACK)
- .setPowerAdvisor(&mPowerAdvisor)
- .setName(getDisplayNameFromCurrentTest())
- .build());
-
- EXPECT_TRUE(GpuVirtualDisplayId::tryCast(mDisplay->getId()));
+ EXPECT_EQ(GPU_VIRTUAL_DISPLAY_ID, mDisplay->getId());
EXPECT_FALSE(mDisplay->isSecure());
EXPECT_TRUE(mDisplay->isVirtual());
EXPECT_EQ(DEFAULT_LAYER_STACK, mDisplay->getState().layerStackId);
@@ -477,7 +425,7 @@
TEST_F(DisplaySetColorModeTest, doesNothingForVirtualDisplay) {
using ColorProfile = Output::ColorProfile;
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
std::shared_ptr<impl::Display> virtualDisplay = impl::createDisplay(mCompositionEngine, args);
mock::DisplayColorProfile* colorProfile = new StrictMock<mock::DisplayColorProfile>();
@@ -557,25 +505,25 @@
using DisplaySetReleasedLayersTest = DisplayWithLayersTestCommon;
-TEST_F(DisplaySetReleasedLayersTest, doesNothingIfNotHwcDisplay) {
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
- std::shared_ptr<impl::Display> nonHwcDisplay = impl::createDisplay(mCompositionEngine, args);
+TEST_F(DisplaySetReleasedLayersTest, doesNothingIfGpuDisplay) {
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
+ std::shared_ptr<impl::Display> gpuDisplay = impl::createDisplay(mCompositionEngine, args);
sp<mock::LayerFE> layerXLayerFE = new StrictMock<mock::LayerFE>();
{
Output::ReleasedLayers releasedLayers;
releasedLayers.emplace_back(layerXLayerFE);
- nonHwcDisplay->setReleasedLayers(std::move(releasedLayers));
+ gpuDisplay->setReleasedLayers(std::move(releasedLayers));
}
CompositionRefreshArgs refreshArgs;
refreshArgs.layersWithQueuedFrames.push_back(layerXLayerFE);
- nonHwcDisplay->setReleasedLayers(refreshArgs);
+ gpuDisplay->setReleasedLayers(refreshArgs);
- const auto& releasedLayers = nonHwcDisplay->getReleasedLayersForTest();
- ASSERT_EQ(1, releasedLayers.size());
+ const auto& releasedLayers = gpuDisplay->getReleasedLayersForTest();
+ ASSERT_EQ(1u, releasedLayers.size());
}
TEST_F(DisplaySetReleasedLayersTest, doesNothingIfNoLayersWithQueuedFrames) {
@@ -591,7 +539,7 @@
mDisplay->setReleasedLayers(refreshArgs);
const auto& releasedLayers = mDisplay->getReleasedLayersForTest();
- ASSERT_EQ(1, releasedLayers.size());
+ ASSERT_EQ(1u, releasedLayers.size());
}
TEST_F(DisplaySetReleasedLayersTest, setReleasedLayers) {
@@ -605,7 +553,7 @@
mDisplay->setReleasedLayers(refreshArgs);
const auto& releasedLayers = mDisplay->getReleasedLayersForTest();
- ASSERT_EQ(2, releasedLayers.size());
+ ASSERT_EQ(2u, releasedLayers.size());
ASSERT_EQ(mLayer1.layerFE.get(), releasedLayers[0].promote().get());
ASSERT_EQ(mLayer2.layerFE.get(), releasedLayers[1].promote().get());
}
@@ -616,15 +564,15 @@
using DisplayChooseCompositionStrategyTest = PartialMockDisplayTestCommon;
-TEST_F(DisplayChooseCompositionStrategyTest, takesEarlyOutIfNotAHwcDisplay) {
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
- std::shared_ptr<Display> nonHwcDisplay =
+TEST_F(DisplayChooseCompositionStrategyTest, takesEarlyOutIfGpuDisplay) {
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
+ std::shared_ptr<Display> gpuDisplay =
createPartialMockDisplay<Display>(mCompositionEngine, args);
- EXPECT_TRUE(GpuVirtualDisplayId::tryCast(nonHwcDisplay->getId()));
+ EXPECT_TRUE(GpuVirtualDisplayId::tryCast(gpuDisplay->getId()));
- nonHwcDisplay->chooseCompositionStrategy();
+ gpuDisplay->chooseCompositionStrategy();
- auto& state = nonHwcDisplay->getState();
+ auto& state = gpuDisplay->getState();
EXPECT_TRUE(state.usesClientComposition);
EXPECT_FALSE(state.usesDeviceComposition);
}
@@ -704,12 +652,12 @@
using DisplayGetSkipColorTransformTest = DisplayWithLayersTestCommon;
-TEST_F(DisplayGetSkipColorTransformTest, checksCapabilityIfNonHwcDisplay) {
+TEST_F(DisplayGetSkipColorTransformTest, checksCapabilityIfGpuDisplay) {
EXPECT_CALL(mHwComposer, hasCapability(hal::Capability::SKIP_CLIENT_COLOR_TRANSFORM))
.WillOnce(Return(true));
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
- auto nonHwcDisplay{impl::createDisplay(mCompositionEngine, args)};
- EXPECT_TRUE(nonHwcDisplay->getSkipColorTransform());
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
+ auto gpuDisplay{impl::createDisplay(mCompositionEngine, args)};
+ EXPECT_TRUE(gpuDisplay->getSkipColorTransform());
}
TEST_F(DisplayGetSkipColorTransformTest, checksDisplayCapability) {
@@ -856,11 +804,11 @@
using DisplayPresentAndGetFrameFencesTest = DisplayWithLayersTestCommon;
-TEST_F(DisplayPresentAndGetFrameFencesTest, returnsNoFencesOnNonHwcDisplay) {
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
- auto nonHwcDisplay{impl::createDisplay(mCompositionEngine, args)};
+TEST_F(DisplayPresentAndGetFrameFencesTest, returnsNoFencesOnGpuDisplay) {
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
+ auto gpuDisplay{impl::createDisplay(mCompositionEngine, args)};
- auto result = nonHwcDisplay->presentAndGetFrameFences();
+ auto result = gpuDisplay->presentAndGetFrameFences();
ASSERT_TRUE(result.presentFence.get());
EXPECT_FALSE(result.presentFence->isValid());
@@ -888,9 +836,9 @@
EXPECT_EQ(presentFence, result.presentFence);
EXPECT_EQ(2u, result.layerFences.size());
- ASSERT_EQ(1, result.layerFences.count(&mLayer1.hwc2Layer));
+ ASSERT_EQ(1u, result.layerFences.count(&mLayer1.hwc2Layer));
EXPECT_EQ(layer1Fence, result.layerFences[&mLayer1.hwc2Layer]);
- ASSERT_EQ(1, result.layerFences.count(&mLayer2.hwc2Layer));
+ ASSERT_EQ(1u, result.layerFences.count(&mLayer2.hwc2Layer));
EXPECT_EQ(layer2Fence, result.layerFences[&mLayer2.hwc2Layer]);
}
@@ -936,66 +884,66 @@
}
TEST_F(DisplayFinishFrameTest, skipsCompositionIfNotDirty) {
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
- std::shared_ptr<impl::Display> nonHwcDisplay = impl::createDisplay(mCompositionEngine, args);
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
+ std::shared_ptr<impl::Display> gpuDisplay = impl::createDisplay(mCompositionEngine, args);
mock::RenderSurface* renderSurface = new StrictMock<mock::RenderSurface>();
- nonHwcDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));
+ gpuDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));
// We expect no calls to queueBuffer if composition was skipped.
EXPECT_CALL(*renderSurface, queueBuffer(_)).Times(0);
- nonHwcDisplay->editState().isEnabled = true;
- nonHwcDisplay->editState().usesClientComposition = false;
- nonHwcDisplay->editState().layerStackSpace.content = Rect(0, 0, 1, 1);
- nonHwcDisplay->editState().dirtyRegion = Region::INVALID_REGION;
+ gpuDisplay->editState().isEnabled = true;
+ gpuDisplay->editState().usesClientComposition = false;
+ gpuDisplay->editState().layerStackSpace.content = Rect(0, 0, 1, 1);
+ gpuDisplay->editState().dirtyRegion = Region::INVALID_REGION;
CompositionRefreshArgs refreshArgs;
refreshArgs.repaintEverything = false;
- nonHwcDisplay->finishFrame(refreshArgs);
+ gpuDisplay->finishFrame(refreshArgs);
}
TEST_F(DisplayFinishFrameTest, performsCompositionIfDirty) {
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
- std::shared_ptr<impl::Display> nonHwcDisplay = impl::createDisplay(mCompositionEngine, args);
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
+ std::shared_ptr<impl::Display> gpuDisplay = impl::createDisplay(mCompositionEngine, args);
mock::RenderSurface* renderSurface = new StrictMock<mock::RenderSurface>();
- nonHwcDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));
+ gpuDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));
// We expect a single call to queueBuffer when composition is not skipped.
EXPECT_CALL(*renderSurface, queueBuffer(_)).Times(1);
- nonHwcDisplay->editState().isEnabled = true;
- nonHwcDisplay->editState().usesClientComposition = false;
- nonHwcDisplay->editState().layerStackSpace.content = Rect(0, 0, 1, 1);
- nonHwcDisplay->editState().dirtyRegion = Region(Rect(0, 0, 1, 1));
+ gpuDisplay->editState().isEnabled = true;
+ gpuDisplay->editState().usesClientComposition = false;
+ gpuDisplay->editState().layerStackSpace.content = Rect(0, 0, 1, 1);
+ gpuDisplay->editState().dirtyRegion = Region(Rect(0, 0, 1, 1));
CompositionRefreshArgs refreshArgs;
refreshArgs.repaintEverything = false;
- nonHwcDisplay->finishFrame(refreshArgs);
+ gpuDisplay->finishFrame(refreshArgs);
}
TEST_F(DisplayFinishFrameTest, performsCompositionIfRepaintEverything) {
- auto args = getDisplayCreationArgsForNonHWCVirtualDisplay();
- std::shared_ptr<impl::Display> nonHwcDisplay = impl::createDisplay(mCompositionEngine, args);
+ auto args = getDisplayCreationArgsForGpuVirtualDisplay();
+ std::shared_ptr<impl::Display> gpuDisplay = impl::createDisplay(mCompositionEngine, args);
mock::RenderSurface* renderSurface = new StrictMock<mock::RenderSurface>();
- nonHwcDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));
+ gpuDisplay->setRenderSurfaceForTest(std::unique_ptr<RenderSurface>(renderSurface));
// We expect a single call to queueBuffer when composition is not skipped.
EXPECT_CALL(*renderSurface, queueBuffer(_)).Times(1);
- nonHwcDisplay->editState().isEnabled = true;
- nonHwcDisplay->editState().usesClientComposition = false;
- nonHwcDisplay->editState().layerStackSpace.content = Rect(0, 0, 1, 1);
- nonHwcDisplay->editState().dirtyRegion = Region::INVALID_REGION;
+ gpuDisplay->editState().isEnabled = true;
+ gpuDisplay->editState().usesClientComposition = false;
+ gpuDisplay->editState().layerStackSpace.content = Rect(0, 0, 1, 1);
+ gpuDisplay->editState().dirtyRegion = Region::INVALID_REGION;
CompositionRefreshArgs refreshArgs;
refreshArgs.repaintEverything = true;
- nonHwcDisplay->finishFrame(refreshArgs);
+ gpuDisplay->finishFrame(refreshArgs);
}
/*
@@ -1020,23 +968,23 @@
NiceMock<mock::CompositionEngine> mCompositionEngine;
sp<mock::NativeWindow> mNativeWindow = new NiceMock<mock::NativeWindow>();
sp<mock::DisplaySurface> mDisplaySurface = new NiceMock<mock::DisplaySurface>();
+
std::shared_ptr<Display> mDisplay = impl::createDisplayTemplated<
Display>(mCompositionEngine,
DisplayCreationArgsBuilder()
- .setPhysical({DEFAULT_DISPLAY_ID, ui::DisplayConnectionType::Internal})
- .setPixels({DEFAULT_DISPLAY_WIDTH, DEFAULT_DISPLAY_HEIGHT})
- .setPixelFormat(static_cast<ui::PixelFormat>(PIXEL_FORMAT_RGBA_8888))
+ .setId(DEFAULT_DISPLAY_ID)
+ .setConnectionType(ui::DisplayConnectionType::Internal)
+ .setPixels(DEFAULT_RESOLUTION)
.setIsSecure(true)
.setLayerStackId(DEFAULT_LAYER_STACK)
.setPowerAdvisor(&mPowerAdvisor)
- .build()
+ .build());
- );
impl::RenderSurface* mRenderSurface =
new impl::RenderSurface{mCompositionEngine, *mDisplay,
RenderSurfaceCreationArgsBuilder()
- .setDisplayWidth(DEFAULT_DISPLAY_WIDTH)
- .setDisplayHeight(DEFAULT_DISPLAY_HEIGHT)
+ .setDisplayWidth(DEFAULT_RESOLUTION.width)
+ .setDisplayHeight(DEFAULT_RESOLUTION.height)
.setNativeWindow(mNativeWindow)
.setDisplaySurface(mDisplaySurface)
.build()};
@@ -1055,6 +1003,3 @@
} // namespace
} // namespace android::compositionengine
-
-// TODO(b/129481165): remove the #pragma below and fix conversion issues
-#pragma clang diagnostic pop // ignored "-Wextra"
diff --git a/services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h b/services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h
index bac894a..ee4f331 100644
--- a/services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h
+++ b/services/surfaceflinger/CompositionEngine/tests/MockHWComposer.h
@@ -45,9 +45,13 @@
MOCK_CONST_METHOD1(hasCapability, bool(hal::Capability));
MOCK_CONST_METHOD2(hasDisplayCapability, bool(HalDisplayId, hal::DisplayCapability));
- MOCK_METHOD3(allocateVirtualDisplay,
- std::optional<DisplayId>(uint32_t, uint32_t, ui::PixelFormat*));
+ MOCK_CONST_METHOD0(getMaxVirtualDisplayCount, size_t());
+ MOCK_CONST_METHOD0(getMaxVirtualDisplayDimension, size_t());
+ MOCK_METHOD4(allocateVirtualDisplay,
+ bool(HalVirtualDisplayId, ui::Size, ui::PixelFormat*,
+ std::optional<PhysicalDisplayId>));
MOCK_METHOD2(allocatePhysicalDisplay, void(hal::HWDisplayId, PhysicalDisplayId));
+
MOCK_METHOD1(createLayer, HWC2::Layer*(HalDisplayId));
MOCK_METHOD2(destroyLayer, void(HalDisplayId, HWC2::Layer*));
MOCK_METHOD3(getDeviceCompositionChanges,