commit d2ad301ea1a0bd356865026b4f37f4c86b75616a
author Stefan Schake <stschake@gmail.com> Fri May 04 18:00:42 2018 +0200
committer Stefan Schake <stschake@gmail.com> Fri May 04 18:12:23 2018 +0200
tree 8baad11cc410989fe10c6b395797875a12c38b65
parent f268ccf5f439b642cc4f94abde4b1a376a8b1ed4

drm_hwcomposer: Remove unused init from HWC1 layer

The HWC1 code isn't being compiled anymore.

Signed-off-by: Stefan Schake <stschake@gmail.com>

drmhwcomposer.h

diff --git a/drmhwcomposer.h b/drmhwcomposer.h
index f8440fb..ff8c642 100644
--- a/drmhwcomposer.h
+++ b/drmhwcomposer.h
@@ -148,8 +148,6 @@
   UniqueFd acquire_fence;
   OutputFd release_fence;
 
-  int InitFromHwcLayer(hwc_layer_1_t *sf_layer, Importer *importer,
-                       const gralloc_module_t *gralloc);
   int ImportBuffer(Importer *importer, const gralloc_module_t *gralloc);
 
   void SetTransform(int32_t sf_transform);

hwcutils.cpp

diff --git a/hwcutils.cpp b/hwcutils.cpp
index 715c93e..c1685c7 100644
--- a/hwcutils.cpp
+++ b/hwcutils.cpp
@@ -121,34 +121,6 @@
   }
 }
 
-int DrmHwcLayer::InitFromHwcLayer(hwc_layer_1_t *sf_layer, Importer *importer,
-                                  const gralloc_module_t *gralloc) {
-  alpha = sf_layer->planeAlpha;
-
-  SetSourceCrop(sf_layer->sourceCropf);
-  SetDisplayFrame(sf_layer->displayFrame);
-  SetTransform(sf_layer->transform);
-
-  switch (sf_layer->blending) {
-    case HWC_BLENDING_NONE:
-      blending = DrmHwcBlending::kNone;
-      break;
-    case HWC_BLENDING_PREMULT:
-      blending = DrmHwcBlending::kPreMult;
-      break;
-    case HWC_BLENDING_COVERAGE:
-      blending = DrmHwcBlending::kCoverage;
-      break;
-    default:
-      ALOGE("Invalid blending in hwc_layer_1_t %d", sf_layer->blending);
-      return -EINVAL;
-  }
-
-  sf_handle = sf_layer->handle;
-
-  return ImportBuffer(importer, gralloc);
-}
-
 int DrmHwcLayer::ImportBuffer(Importer *importer,
                               const gralloc_module_t *gralloc) {
   int ret = buffer.ImportBuffer(sf_handle, importer);