diff options
| author | Zach Reizner <zachr@google.com> | 2015-07-22 15:01:37 -0700 |
|---|---|---|
| committer | Zach Reizner <zachr@google.com> | 2015-07-22 15:01:37 -0700 |
| commit | 7912438911de042dc035cf1ea39daaf4e56bf9f3 (patch) | |
| tree | 44009f67acf89938e0876d08fef7e4fd7bedac89 /drmcomposition.h | |
| parent | abebc7a78fe8a4df6495c8e5064719dc92b04004 (diff) | |
| download | drm_hwcomposer-7912438911de042dc035cf1ea39daaf4e56bf9f3.tar.gz | |
drm_hwcomposer: remove compositor interface
The compositor interface had only one implementation and one user. The
compositor interface also needs to change to accomodate some changes for
fences to work optimally.
Change-Id: I02d21b0a0e86fa21b3c5f4ad84ff571611643994
Diffstat (limited to 'drmcomposition.h')
| -rw-r--r-- | drmcomposition.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/drmcomposition.h b/drmcomposition.h index 06af71d..69bf6d9 100644 --- a/drmcomposition.h +++ b/drmcomposition.h @@ -17,7 +17,6 @@ #ifndef ANDROID_DRM_COMPOSITION_H_ #define ANDROID_DRM_COMPOSITION_H_ -#include "compositor.h" #include "drm_hwcomposer.h" #include "drmdisplaycomposition.h" #include "drmplane.h" @@ -32,15 +31,15 @@ namespace android { -class DrmComposition : public Composition { +class DrmComposition { public: DrmComposition(DrmResources *drm, Importer *importer); ~DrmComposition(); - virtual int Init(); + int Init(); - virtual unsigned GetRemainingLayers(int display, unsigned num_needed) const; - virtual int AddLayer(int display, hwc_layer_1_t *layer, hwc_drm_bo_t *bo); + unsigned GetRemainingLayers(int display, unsigned num_needed) const; + int AddLayer(int display, hwc_layer_1_t *layer, hwc_drm_bo_t *bo); int AddDpmsMode(int display, uint32_t dpms_mode); int DisableUnusedPlanes(); |