Removed unused is_cursor_layer param in InitializeFromNativeHandle.

Jira: None.
Test: Build passes on Linux and Android.

Signed-off-by: Kalyan Kondapally <kalyan.kondapally@intel.com>

diff --git a/common/core/nesteddisplay.cpp b/common/core/nesteddisplay.cpp
index 3c2a33d..a24c31d 100644 (file)
--- a/common/core/nesteddisplay.cpp
+++ b/common/core/nesteddisplay.cpp
@@ -199,7 +199,6 @@ bool NestedDisplay::Present(std::vector<HwcLayer *> &source_layers,
   const uint32_t *offsets;
   HWCNativeHandle sf_handle;
   size_t buffer_number = 0;
-  bool is_cursor_layer = false;
   size_t info_size = sizeof(vm_buffer_info);
   size_t header_size = sizeof(vm_header);
 
@@ -211,12 +210,11 @@ bool NestedDisplay::Present(std::vector<HwcLayer *> &source_layers,
 
     const HwcRect<int> &display_frame = layer->GetDisplayFrame();
     sf_handle = layer->GetNativeHandle();
-    is_cursor_layer = layer->IsCursorLayer();
     auto search = mHyperDmaExportedBuffers.find(sf_handle);
     if (search == mHyperDmaExportedBuffers.end()) {
       std::shared_ptr<OverlayBuffer> buffer(NULL);
       buffer = OverlayBuffer::CreateOverlayBuffer();
-      buffer->InitializeFromNativeHandle(sf_handle, resource_manager_.get(), is_cursor_layer);
+      buffer->InitializeFromNativeHandle(sf_handle, resource_manager_.get());
 
       if (mHyperDmaBuf_Fd > 0 && buffer->GetPrimeFD() > 0) {
         struct ioctl_hyper_dmabuf_export_remote msg;

diff --git a/common/core/overlaylayer.cpp b/common/core/overlaylayer.cpp
index c008b1c..263f5b3 100644 (file)
--- a/common/core/overlaylayer.cpp
+++ b/common/core/overlaylayer.cpp
@@ -72,7 +72,7 @@ std::shared_ptr<OverlayBuffer>& OverlayLayer::GetSharedBuffer() const {
 
 void OverlayLayer::SetBuffer(HWCNativeHandle handle, int32_t acquire_fence,
                              ResourceManager* resource_manager,
-                             bool register_buffer, HwcLayer* layer) {
+                             bool register_buffer) {
   std::shared_ptr<OverlayBuffer> buffer(NULL);
 
   uint32_t id;
@@ -85,12 +85,7 @@ void OverlayLayer::SetBuffer(HWCNativeHandle handle, int32_t acquire_fence,
 
   if (buffer == NULL) {
     buffer = OverlayBuffer::CreateOverlayBuffer();
-    bool is_cursor_layer = false;
-    if (layer) {
-      is_cursor_layer = layer->IsCursorLayer();
-    }
-    buffer->InitializeFromNativeHandle(handle, resource_manager,
-                                       is_cursor_layer);
+    buffer->InitializeFromNativeHandle(handle, resource_manager);
     if (resource_manager && register_buffer) {
       resource_manager->RegisterBuffer(id, buffer);
     }
@@ -242,7 +237,7 @@ void OverlayLayer::InitializeState(HwcLayer* layer,
   }
 
   SetBuffer(layer->GetNativeHandle(), layer->GetAcquireFence(),
-            resource_manager, true, layer);
+           resource_manager, true);
 
   if (!surface_damage_.empty()) {
     if (type_ == kLayerCursor) {

diff --git a/common/core/overlaylayer.h b/common/core/overlaylayer.h
index aaa7c0d..8212f83 100644 (file)
--- a/common/core/overlaylayer.h
+++ b/common/core/overlaylayer.h
@@ -101,8 +101,7 @@ struct OverlayLayer {
   OverlayBuffer* GetBuffer() const;
 
   void SetBuffer(HWCNativeHandle handle, int32_t acquire_fence,
-                 ResourceManager* buffer_manager, bool register_buffer,
-                 HwcLayer* layer = NULL);
+                 ResourceManager* buffer_manager, bool register_buffer);
 
   std::shared_ptr<OverlayBuffer>& GetSharedBuffer() const;
 

diff --git a/wsi/drm/drmbuffer.cpp b/wsi/drm/drmbuffer.cpp
index 17a3f35..24bb5c5 100644 (file)
--- a/wsi/drm/drmbuffer.cpp
+++ b/wsi/drm/drmbuffer.cpp
@@ -79,8 +79,7 @@ void DrmBuffer::Initialize(const HwcBuffer& bo) {
 }
 
 void DrmBuffer::InitializeFromNativeHandle(HWCNativeHandle handle,
-                                           ResourceManager* resource_manager,
-                                           bool is_cursor_buffer) {
+                                           ResourceManager* resource_manager) {
   resource_manager_ = resource_manager;
   const NativeBufferHandler* handler =
       resource_manager_->GetNativeBufferHandler();

diff --git a/wsi/drm/drmbuffer.h b/wsi/drm/drmbuffer.h
index 71dc1d0..e0e81f1 100644 (file)
--- a/wsi/drm/drmbuffer.h
+++ b/wsi/drm/drmbuffer.h
@@ -34,8 +34,7 @@ class DrmBuffer : public OverlayBuffer {
   ~DrmBuffer() override;
 
   void InitializeFromNativeHandle(HWCNativeHandle handle,
-                                  ResourceManager* buffer_manager,
-                                  bool is_cursor_buffer) override;
+                                  ResourceManager* buffer_manager) override;
 
   uint32_t GetWidth() const override {
     return width_;

diff --git a/wsi/overlaybuffer.h b/wsi/overlaybuffer.h
index 08fab0c..7932ec2 100644 (file)
--- a/wsi/overlaybuffer.h
+++ b/wsi/overlaybuffer.h
@@ -41,8 +41,7 @@ class OverlayBuffer {
   }
 
   virtual void InitializeFromNativeHandle(HWCNativeHandle handle,
-                                          ResourceManager* buffer_manager,
-                                          bool is_cursor_buffer) = 0;
+                                          ResourceManager* buffer_manager) = 0;
 
   virtual uint32_t GetWidth() const = 0;