Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bc82e4c authored by Steven Thomas's avatar Steven Thomas Committed by Android (Google) Code Review
Browse files

Merge "Use a separate hwcomposer hidl instance for vr flinger" into oc-mr1-dev-plus-aosp

parents 5e371614 b02664dd

libs/vr/libvrflinger/display_service.cpp

+2 −8
Original line number Original line Diff line number Diff line
@@ -40,10 +40,8 @@ namespace dvr { 
DisplayService::DisplayService(Hwc2::Composer* hidl,

DisplayService::DisplayService(Hwc2::Composer* hidl,

                               RequestDisplayCallback request_display_callback)

                               RequestDisplayCallback request_display_callback)

    : BASE("DisplayService",

    : BASE("DisplayService",

           Endpoint::Create(display::DisplayProtocol::kClientPath)),

           Endpoint::Create(display::DisplayProtocol::kClientPath)) {

      hardware_composer_(hidl, request_display_callback),

  hardware_composer_.Initialize(hidl, request_display_callback);

      request_display_callback_(request_display_callback) {

  hardware_composer_.Initialize();

}

}





bool DisplayService::IsInitialized() const {

bool DisplayService::IsInitialized() const {
@@ -398,10 +396,6 @@ pdx::Status<void> DisplayService::DeleteGlobalBuffer(DvrGlobalBufferKey key) { 
  return {0};

  return {0};

}

}





void DisplayService::OnHardwareComposerRefresh() {

  hardware_composer_.OnHardwareComposerRefresh();

}



void DisplayService::SetDisplayConfigurationUpdateNotifier(

void DisplayService::SetDisplayConfigurationUpdateNotifier(

    DisplayConfigurationUpdateNotifier update_notifier) {

    DisplayConfigurationUpdateNotifier update_notifier) {

  update_notifier_ = update_notifier;

  update_notifier_ = update_notifier;

libs/vr/libvrflinger/display_service.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -72,8 +72,6 @@ class DisplayService : public pdx::ServiceBase<DisplayService> { 
  void GrantDisplayOwnership() { hardware_composer_.Enable(); }

  void GrantDisplayOwnership() { hardware_composer_.Enable(); }

  void SeizeDisplayOwnership() { hardware_composer_.Disable(); }

  void SeizeDisplayOwnership() { hardware_composer_.Disable(); }





  void OnHardwareComposerRefresh();



 private:

 private:

  friend BASE;

  friend BASE;

  friend DisplaySurface;

  friend DisplaySurface;
@@ -119,7 +117,6 @@ class DisplayService : public pdx::ServiceBase<DisplayService> { 
  pdx::Status<void> HandleSurfaceMessage(pdx::Message& message);

  pdx::Status<void> HandleSurfaceMessage(pdx::Message& message);





  HardwareComposer hardware_composer_;

  HardwareComposer hardware_composer_;

  RequestDisplayCallback request_display_callback_;

  EpollEventDispatcher dispatcher_;

  EpollEventDispatcher dispatcher_;

  DisplayConfigurationUpdateNotifier update_notifier_;

  DisplayConfigurationUpdateNotifier update_notifier_;

libs/vr/libvrflinger/hardware_composer.cpp

+130 −222

File changed.

Preview size limit exceeded, changes collapsed.

libs/vr/libvrflinger/hardware_composer.h

+44 −66

File changed.

Preview size limit exceeded, changes collapsed.

libs/vr/libvrflinger/include/dvr/vr_flinger.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -29,9 +29,6 @@ class VrFlinger { 
  void GrantDisplayOwnership();

  void GrantDisplayOwnership();

  void SeizeDisplayOwnership();

  void SeizeDisplayOwnership();





  // Called on a binder thread.

  void OnHardwareComposerRefresh();



  // dump all vr flinger state.

  // dump all vr flinger state.

  std::string Dump();

  std::string Dump();