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

Commit 436ddb14 authored by Steven Thomas's avatar Steven Thomas Committed by android-build-merger
Browse files

Merge "Support external display rendering in vr flinger" into pi-dev 

am: 5f643f8f

Change-Id: I293f1615c1d9729b7f4b0c3e24a3273d574b1fe8
parents 8e272aac 5f643f8f

libs/vr/libvrflinger/Android.bp

+4 −0
Original line number Diff line number Diff line
@@ -72,6 +72,7 @@ cc_library_static { 
    srcs: sourceFiles,

    export_include_dirs: includeFiles,



    clang: true,

    cflags: [

        "-DLOG_TAG=\"vr_flinger\"",

        "-DTRACE=0",
@@ -83,6 +84,9 @@ cc_library_static { 
        "-Wno-error=sign-compare", // to fix later

        "-Wno-unused-variable",

    ],

    cppflags: [

        "-std=c++1z"

    ],

    shared_libs: sharedLibraries,

    whole_static_libs: staticLibraries,

    header_libs: headerLibraries,

libs/vr/libvrflinger/display_service.cpp

+6 −6
Original line number Diff line number Diff line
@@ -177,12 +177,12 @@ Status<void> DisplayService::HandleMessage(pdx::Message& message) { 


Status<display::Metrics> DisplayService::OnGetMetrics(

    pdx::Message& /*message*/) {

  return {{static_cast<uint32_t>(GetDisplayMetrics().width),

           static_cast<uint32_t>(GetDisplayMetrics().height),

           static_cast<uint32_t>(GetDisplayMetrics().dpi.x),

           static_cast<uint32_t>(GetDisplayMetrics().dpi.y),

           static_cast<uint32_t>(

               hardware_composer_.native_display_metrics().vsync_period_ns),

  const auto& params = hardware_composer_.GetPrimaryDisplayParams();

  return {{static_cast<uint32_t>(params.width),

           static_cast<uint32_t>(params.height),

           static_cast<uint32_t>(params.dpi.x),

           static_cast<uint32_t>(params.dpi.y),

           static_cast<uint32_t>(params.vsync_period_ns),

           0,

           0,

           0,

libs/vr/libvrflinger/display_service.h

+0 −4
Original line number Diff line number Diff line
@@ -65,10 +65,6 @@ class DisplayService : public pdx::ServiceBase<DisplayService> { 
    hardware_composer_.SetVSyncCallback(callback);

  }



  HWCDisplayMetrics GetDisplayMetrics() {

    return hardware_composer_.display_metrics();

  }



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

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

  void OnBootFinished() { hardware_composer_.OnBootFinished(); }