namespace android {
class Importer;
+class Planner;
class SquashState;
enum DrmCompositionType {
DRM_COMPOSITION_TYPE_MODESET,
};
+struct DrmCompositionDisplayLayersMap {
+ int display;
+ bool geometry_changed = true;
+ std::vector<DrmHwcLayer> layers;
+
+ DrmCompositionDisplayLayersMap() = default;
+ DrmCompositionDisplayLayersMap(DrmCompositionDisplayLayersMap &&rhs) =
+ default;
+};
+
struct DrmCompositionRegion {
DrmHwcRect<int> frame;
std::vector<size_t> source_layers;
~DrmDisplayComposition();
int Init(DrmResources *drm, DrmCrtc *crtc, Importer *importer,
- uint64_t frame_no);
+ Planner *planner, uint64_t frame_no);
int SetLayers(DrmHwcLayer *layers, size_t num_layers, bool geometry_changed);
int AddPlaneComposition(DrmCompositionPlane plane);
return importer_;
}
+ Planner *planner() const {
+ return planner_;
+ }
+
+ int take_out_fence() {
+ return out_fence_.Release();
+ }
+
+ void set_out_fence(int out_fence) {
+ out_fence_.Set(out_fence);
+ }
+
void Dump(std::ostringstream *out) const;
private:
int IncreaseTimelineToPoint(int point);
- void EmplaceCompositionPlane(DrmCompositionPlane::Type type,
- std::vector<DrmPlane *> *primary_planes,
- std::vector<DrmPlane *> *overlay_planes);
- void EmplaceCompositionPlane(size_t source_layer,
- std::vector<DrmPlane *> *primary_planes,
- std::vector<DrmPlane *> *overlay_planes);
- void SeparateLayers(size_t *used_layers, size_t num_used_layers,
- DrmHwcRect<int> *exclude_rects, size_t num_exclude_rects);
+ int FinalizeComposition(DrmHwcRect<int> *exclude_rects,
+ size_t num_exclude_rects);
+ void SeparateLayers(DrmHwcRect<int> *exclude_rects, size_t num_exclude_rects);
int CreateAndAssignReleaseFences();
DrmResources *drm_ = NULL;
DrmCrtc *crtc_ = NULL;
Importer *importer_ = NULL;
+ Planner *planner_ = NULL;
DrmCompositionType type_ = DRM_COMPOSITION_TYPE_EMPTY;
uint32_t dpms_mode_ = DRM_MODE_DPMS_ON;
int timeline_current_ = 0;
int timeline_squash_done_ = 0;
int timeline_pre_comp_done_ = 0;
+ UniqueFd out_fence_ = -1;
bool geometry_changed_;
std::vector<DrmHwcLayer> layers_;