Merge "Revert "drm_hwcomposer: remove GLCompositor and the GLWorker thread"" into...

[android-x86/external-drm_hwcomposer.git] / drmdisplaycomposition.h

diff --git a/drmdisplaycomposition.h b/drmdisplaycomposition.h
index 09ad3ff..9c51078 100644 (file)
--- a/drmdisplaycomposition.h
+++ b/drmdisplaycomposition.h
@@ -56,6 +56,9 @@ class DrmDisplayComposition {
 
   int AddLayer(hwc_layer_1_t *layer, hwc_drm_bo_t *bo, DrmCrtc *crtc,
                DrmPlane *plane);
+  // Like the AddLayer that accepts a hwc_drm_bo_t, but uses Importer to import
+  // the layer->handle itself.
+  int AddLayer(hwc_layer_1_t *layer, DrmCrtc *crtc, DrmPlane *plane);
   int AddPlaneDisable(DrmPlane *plane);
   int AddDpmsMode(uint32_t dpms_mode);
 
@@ -76,6 +79,7 @@ class DrmDisplayComposition {
 
   int timeline_fd_;
   int timeline_;
+  int timeline_current_;
 
   DrmCompositionLayerVector_t layers_;
   uint32_t dpms_mode_;