Cleanup: Remove unused variables in Compositor.

We dont any more need to track width, height, NativeBufferHandler
in compositor. Remove them.

Jira: None.
Test: Build passes.

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

diff --git a/common/compositor/compositor.cpp b/common/compositor/compositor.cpp
index 5b3a102..2487022 100644 (file)
--- a/common/compositor/compositor.cpp
+++ b/common/compositor/compositor.cpp
@@ -37,14 +37,8 @@ Compositor::Compositor() {
 Compositor::~Compositor() {
 }
 
-void Compositor::Init(NativeBufferHandler *buffer_handler, uint32_t width,
-                      uint32_t height, uint32_t gpu_fd) {
-  buffer_handler_ = buffer_handler;
-  gpu_fd_ = gpu_fd;
+void Compositor::Init() {
   gpu_resource_handler_.reset(CreateNativeGpuResourceHandler());
-
-  width_ = width;
-  height_ = height;
 }
 
 bool Compositor::BeginFrame() {
@@ -107,6 +101,8 @@ bool Compositor::Draw(DisplayPlaneStateList &comp_planes,
 bool Compositor::DrawOffscreen(std::vector<OverlayLayer> &layers,
                                const std::vector<HwcRect<int>> &display_frame,
                                const std::vector<size_t> &source_layers,
+                               NativeBufferHandler *buffer_handler,
+                               uint32_t width, uint32_t height,
                                HWCNativeHandle output_handle,
                                int32_t *retire_fence) {
   ScopedRendererState state(renderer_.get());
@@ -134,8 +130,8 @@ bool Compositor::DrawOffscreen(std::vector<OverlayLayer> &layers,
     return false;
   }
 
-  std::unique_ptr<NativeSurface> surface(CreateBackBuffer(width_, height_));
-  surface->InitializeForOffScreenRendering(buffer_handler_, output_handle);
+  std::unique_ptr<NativeSurface> surface(CreateBackBuffer(width, height));
+  surface->InitializeForOffScreenRendering(buffer_handler, output_handle);
 
   if (!Render(layers, surface.get(), comp_regions))
     return false;

diff --git a/common/compositor/compositor.h b/common/compositor/compositor.h
index 40b2670..2759373 100644 (file)
--- a/common/compositor/compositor.h
+++ b/common/compositor/compositor.h
@@ -36,8 +36,7 @@ class Compositor {
   Compositor();
   ~Compositor();
 
-  void Init(NativeBufferHandler *buffer_handler, uint32_t width,
-            uint32_t height, uint32_t gpu_fd);
+  void Init();
 
   Compositor(const Compositor &) = delete;
 
@@ -47,7 +46,9 @@ class Compositor {
   bool DrawOffscreen(std::vector<OverlayLayer> &layers,
                      const std::vector<HwcRect<int>> &display_frame,
                      const std::vector<size_t> &source_layers,
-                     HWCNativeHandle output_handle, int32_t *retire_fence);
+                     NativeBufferHandler *buffer_handler, uint32_t width,
+                     uint32_t height, HWCNativeHandle output_handle,
+                     int32_t *retire_fence);
   void InsertFence(int fence);
 
  private:
@@ -59,14 +60,7 @@ class Compositor {
                       std::vector<CompositionRegion> &comp_regions);
 
   InternalDisplay *display_;
-
-  uint32_t gpu_fd_;
-  uint32_t width_;
-  uint32_t height_;
-  std::vector<std::unique_ptr<NativeSurface>> surfaces_;
   std::unique_ptr<Renderer> renderer_;
-  NativeBufferHandler *buffer_handler_;
-  std::vector<NativeSurface *> in_flight_surfaces_;
   std::unique_ptr<NativeGpuResource> gpu_resource_handler_;
 };
 }

diff --git a/common/core/internaldisplay.cpp b/common/core/internaldisplay.cpp
index e26078b..edb097b 100644 (file)
--- a/common/core/internaldisplay.cpp
+++ b/common/core/internaldisplay.cpp
@@ -103,7 +103,7 @@ bool InternalDisplay::Connect(const drmModeModeInfo &mode_info,
     return false;
   }
 
-  compositor_.Init(&buffer_handler_, width_, height_, gpu_fd_);
+  compositor_.Init();
   flip_handler_->Init(refresh_, gpu_fd_, pipe_);
   dpms_mode_ = DRM_MODE_DPMS_ON;
   drmModeConnectorSetProperty(gpu_fd_, connector_, dpms_prop_,

diff --git a/common/core/virtualdisplay.cpp b/common/core/virtualdisplay.cpp
index a250c4d..29650ea 100644 (file)
--- a/common/core/virtualdisplay.cpp
+++ b/common/core/virtualdisplay.cpp
@@ -38,7 +38,9 @@ VirtualDisplay::~VirtualDisplay() {
 }
 
 void VirtualDisplay::InitVirtualDisplay(uint32_t width, uint32_t height) {
-  compositor_.Init(&buffer_handler_, width, height, gpu_fd_);
+  compositor_.Init();
+  width_ = width;
+  height_ = height;
 }
 
 bool VirtualDisplay::GetActiveConfig(uint32_t *config) {
@@ -87,7 +89,8 @@ bool VirtualDisplay::Present(
 
   int retire_fence;
   // Prepare for final composition.
-  if (!compositor_.DrawOffscreen(layers, layers_rects, index, output_handle_,
+  if (!compositor_.DrawOffscreen(layers, layers_rects, index, &buffer_handler_,
+                                 width_, height_, output_handle_,
                                  &retire_fence)) {
     ETRACE("Failed to prepare for the frame composition ret=%d", ret);
     return false;

diff --git a/common/core/virtualdisplay.h b/common/core/virtualdisplay.h
index 9b1fdf6..dad6f86 100644 (file)
--- a/common/core/virtualdisplay.h
+++ b/common/core/virtualdisplay.h
@@ -49,6 +49,8 @@ class VirtualDisplay : public Headless {
   NativeBufferHandler &buffer_handler_;
   Compositor compositor_;
   uint32_t gpu_fd_;
+  uint32_t width_;
+  uint32_t height_;
 };
 
 }  // namespace hwcomposer