diff options
author | Matvii Zorin <matvii.zorin@globallogic.com> | 2021-01-12 10:53:08 +0200 |
---|---|---|
committer | Matvii Zorin <matvii.zorin@globallogic.com> | 2021-04-06 12:46:22 +0300 |
commit | 5368b732c803b6b74a4d815a46b421f2e6950df7 (patch) | |
tree | 8f5407cbe4f66cdf8e8f6bd93c76865bb4ece390 | |
parent | dcea03cd88e9db748fa4470f50a30294ea16f50c (diff) | |
download | drm_hwcomposer-5368b732c803b6b74a4d815a46b421f2e6950df7.tar.gz |
drm_hwcomposer: Remove DrmCompositionDisplayLayersMap
The structure is used only at the CreateComposition function.
Data consolidation is unnecessary in this case.
Signed-off-by: Matvii Zorin <matvii.zorin@globallogic.com>
-rw-r--r-- | DrmHwcTwo.cpp | 14 | ||||
-rw-r--r-- | compositor/DrmDisplayComposition.h | 10 |
2 files changed, 5 insertions, 19 deletions
diff --git a/DrmHwcTwo.cpp b/DrmHwcTwo.cpp index 617dddb..7f5d639 100644 --- a/DrmHwcTwo.cpp +++ b/DrmHwcTwo.cpp @@ -626,13 +626,6 @@ bool DrmHwcTwo::HwcDisplay::HardwareSupportsLayerType( } HWC2::Error DrmHwcTwo::HwcDisplay::CreateComposition(bool test) { - std::vector<DrmCompositionDisplayLayersMap> layers_map; - layers_map.emplace_back(); - DrmCompositionDisplayLayersMap &map = layers_map.back(); - - map.display = static_cast<int>(handle_); - map.geometry_changed = true; // TODO(nobody): Fix this - // order the layers by z-order bool use_client_layer = false; uint32_t client_z_order = UINT32_MAX; @@ -657,6 +650,8 @@ HWC2::Error DrmHwcTwo::HwcDisplay::CreateComposition(bool test) { if (z_map.empty()) return HWC2::Error::BadLayer; + std::vector<DrmHwcLayer> composition_layers; + // now that they're ordered by z, add them to the composition for (std::pair<const uint32_t, DrmHwcTwo::HwcLayer *> &l : z_map) { DrmHwcLayer layer; @@ -666,14 +661,15 @@ HWC2::Error DrmHwcTwo::HwcDisplay::CreateComposition(bool test) { ALOGE("Failed to import layer, ret=%d", ret); return HWC2::Error::NoResources; } - map.layers.emplace_back(std::move(layer)); + composition_layers.emplace_back(std::move(layer)); } auto composition = std::make_unique<DrmDisplayComposition>(crtc_, planner_.get()); // TODO(nobody): Don't always assume geometry changed - int ret = composition->SetLayers(map.layers.data(), map.layers.size(), true); + int ret = composition->SetLayers(composition_layers.data(), + composition_layers.size(), true); if (ret) { ALOGE("Failed to set layers in the composition ret=%d", ret); return HWC2::Error::BadLayer; diff --git a/compositor/DrmDisplayComposition.h b/compositor/DrmDisplayComposition.h index d7ee9cf..5d076b3 100644 --- a/compositor/DrmDisplayComposition.h +++ b/compositor/DrmDisplayComposition.h @@ -40,16 +40,6 @@ enum DrmCompositionType { DRM_COMPOSITION_TYPE_MODESET, }; -struct DrmCompositionDisplayLayersMap { - int display; - bool geometry_changed = true; - std::vector<DrmHwcLayer> layers; - - DrmCompositionDisplayLayersMap() = default; - DrmCompositionDisplayLayersMap(DrmCompositionDisplayLayersMap &&rhs) = - default; -}; - class DrmCompositionPlane { public: enum class Type : int32_t { |