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

Commit 8a0be906 authored by Alex Sakhartchouk's avatar Alex Sakhartchouk
Browse files

Preserve phones screen aspect ratio for VR Window Manager. 

We are a portrait device rotated to landscape mode, adjust rendering
inside vr_wm accordingly.

Bug: 36201035
Test: Built, ran permissions gen, denied permission.
Change-Id: I27382ea6f5417a92791eafa9daaa81cc4af6db11
parent 444ad1ee

services/vr/vr_window_manager/composer/impl/vr_hwc.cpp

+2 −2
Original line number Diff line number Diff line
@@ -301,10 +301,10 @@ Error VrHwc::getDisplayAttribute(Display display, Config config, 


  switch (attribute) {

    case IComposerClient::Attribute::WIDTH:

      *outValue = 1920;

      *outValue = 1080;

      break;

    case IComposerClient::Attribute::HEIGHT:

      *outValue = 1080;

      *outValue = 1920;

      break;

    case IComposerClient::Attribute::VSYNC_PERIOD:

      *outValue = 1000 * 1000 * 1000 / 30;  // 30fps

services/vr/vr_window_manager/shell_view.cpp

+5 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ namespace dvr { 


namespace {



constexpr float kLayerScaleFactor = 4.0f;

constexpr float kLayerScaleFactor = 3.0f;



constexpr unsigned int kVRAppLayerCount = 2;
@@ -131,7 +131,7 @@ mat4 GetHorizontallyAlignedMatrixFromPose(const Posef& pose) { 
  m(3, 0) = 0.0f; m(3, 1) = 0.0f; m(3, 2) = 0.0f; m(3, 3) = 1.0f;

  // clang-format on



  return m * Eigen::AngleAxisf(M_PI * 0.5f, vec3::UnitZ());

  return m;

}



// Helper function that applies the crop transform to the texture layer and
@@ -712,10 +712,12 @@ void ShellView::Touch() { 
    return;

  }



  // Device is portrait, but in landscape when in VR.

  // Rotate touch input appropriately.

  const android::status_t status = virtual_touchpad_->Touch(

      VirtualTouchpad::PRIMARY,

      1.0f - hit_location_in_window_coord_.y() / size_.y(),

      hit_location_in_window_coord_.x() / size_.x(),

      hit_location_in_window_coord_.y() / size_.y(),

      is_touching_ ? 1.0f : 0.0f);

  if (status != OK) {

    ALOGE("touch failed: %d", status);