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

Commit d913d3ec authored by Corey Tabaka's avatar Corey Tabaka Committed by android-build-merger
Browse files

Merge commit '88a9bc0d' into manual_merge_88a9bc0d9 

am: e3917218

Change-Id: I7eef4faa5c3f1003f17eb6107228d2b7ef2bd551
parents 9eb23f35 e3917218

libs/vr/libvrflinger/display_service.cpp

+0 −8
Original line number Diff line number Diff line
@@ -349,17 +349,9 @@ DisplayService::GetVisibleDisplaySurfaces() const { 


void DisplayService::UpdateActiveDisplaySurfaces() {

  auto visible_surfaces = GetVisibleDisplaySurfaces();



  std::sort(visible_surfaces.begin(), visible_surfaces.end(),

            [](const std::shared_ptr<DisplaySurface>& a,

               const std::shared_ptr<DisplaySurface>& b) {

              return a->z_order() < b->z_order();

            });



  ALOGD_IF(TRACE,

           "DisplayService::UpdateActiveDisplaySurfaces: %zd visible surfaces",

           visible_surfaces.size());



  hardware_composer_.SetDisplaySurfaces(std::move(visible_surfaces));

}

libs/vr/libvrflinger/hardware_composer.cpp

+205 −149

File changed.

Preview size limit exceeded, changes collapsed.

libs/vr/libvrflinger/hardware_composer.h

+62 −38

File changed.

Preview size limit exceeded, changes collapsed.