drm_hwcomposer: Handle unused planes by DrmDisplayCompositor
Rationale:
1. Cleanup/Simplify DrmDisplayComposition class
2. Prepare for shared planes support
Signed-off-by: Roman Stratiienko <roman.o.stratiienko@globallogic.com>
Tested-by: Martin Juecker <martin.juecker@gmail.com>
Reviewed-by: Matvii Zorin <matvii.zorin@globallogic.com>
diff --git a/compositor/DrmDisplayComposition.h b/compositor/DrmDisplayComposition.h
index f1958d7..2ddfaac 100644
--- a/compositor/DrmDisplayComposition.h
+++ b/compositor/DrmDisplayComposition.h
@@ -34,22 +34,13 @@
class DrmCompositionPlane {
public:
- enum class Type : int32_t {
- kDisable,
- kLayer,
- };
-
DrmCompositionPlane() = default;
DrmCompositionPlane(DrmCompositionPlane &&rhs) = default;
DrmCompositionPlane &operator=(DrmCompositionPlane &&other) = default;
- DrmCompositionPlane(Type type, DrmPlane *plane) : type_(type), plane_(plane) {
+ DrmCompositionPlane(DrmPlane *plane) : plane_(plane) {
}
- DrmCompositionPlane(Type type, DrmPlane *plane, size_t source_layer)
- : type_(type), plane_(plane), source_layers_(1, source_layer) {
- }
-
- Type type() const {
- return type_;
+ DrmCompositionPlane(DrmPlane *plane, size_t source_layer)
+ : plane_(plane), source_layers_(1, source_layer) {
}
DrmPlane *plane() const {
@@ -68,7 +59,6 @@
}
private:
- Type type_ = Type::kDisable;
DrmPlane *plane_ = NULL;
std::vector<size_t> source_layers_;
};
@@ -81,7 +71,6 @@
int SetLayers(DrmHwcLayer *layers, size_t num_layers);
int AddPlaneComposition(DrmCompositionPlane plane);
- int AddPlaneDisable(DrmPlane *plane);
int Plan(std::vector<DrmPlane *> *primary_planes,
std::vector<DrmPlane *> *overlay_planes);