commit 1c5e55680d9165d8f9bb2bc6e2c4261574b5d41d
author Puneet Kumar <puneetster@google.com> Thu Jul 30 03:35:38 2015 +0000
committer Puneet Kumar <puneetster@google.com> Thu Jul 30 03:35:38 2015 +0000
tree 59dfc0090c4c085ad306f8d0789a144fb620f8b0
parent 7912438911de042dc035cf1ea39daaf4e56bf9f3

Revert "drm_hwcomposer: remove compositor interface"

This reverts commit 7912438911de042dc035cf1ea39daaf4e56bf9f3.

For now until we can get back to a stable SF/compositor.

Change-Id: I2ba7cab4f1cccfe44b3d35fb18c7784125e88fd6

hwcomposer.cpp

diff --git a/hwcomposer.cpp b/hwcomposer.cpp
index a83c247..b4b1a50 100644
--- a/hwcomposer.cpp
+++ b/hwcomposer.cpp
@@ -110,7 +110,7 @@
 
 static void hwc_set_cleanup(size_t num_displays,
                             hwc_display_contents_1_t **display_contents,
-                            DrmComposition *composition) {
+                            Composition *composition) {
   for (int i = 0; i < (int)num_displays; ++i) {
     if (!display_contents[i])
       continue;
@@ -133,7 +133,7 @@
 }
 
 static int hwc_add_layer(int display, hwc_context_t *ctx, hwc_layer_1_t *layer,
-                         DrmComposition *composition) {
+                         Composition *composition) {
   hwc_drm_bo_t bo;
   int ret = ctx->importer->ImportBuffer(layer->handle, &bo);
   if (ret) {
@@ -171,7 +171,7 @@
                    hwc_display_contents_1_t **display_contents) {
   ATRACE_CALL();
   struct hwc_context_t *ctx = (struct hwc_context_t *)&dev->common;
-  DrmComposition *composition =
+  Composition *composition =
       ctx->drm.compositor()->CreateComposition(ctx->importer);
   if (!composition) {
     ALOGE("Drm composition init failed");