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

Commit 99360367 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge changes I23836041,Ic0c9754d,Iae781f49 

* changes:
  Update GVR prebuilts to CL@146314416
  Add 6dof to the list of supported gvr features
  Fix an incorrect LOG_ALWAYS_FATAL_IF introduced in sweep
parents 553891a3 7cc7ab76

libs/vr/libeds/distortion_renderer.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -308,7 +308,7 @@ void DistortionRenderer::EdsShader::load(const char* vertex, 
  if (blend_with_previous_layer) {

  if (blend_with_previous_layer) {

    // Check for unsupported shader combinations:

    // Check for unsupported shader combinations:

    LOG_ALWAYS_FATAL_IF(num_layers != 1);

    LOG_ALWAYS_FATAL_IF(num_layers != 1);

    LOG_ALWAYS_FATAL_IF(!use_alpha_vignette);

    LOG_ALWAYS_FATAL_IF(use_alpha_vignette);

    if (kUseFramebufferReadback)

    if (kUseFramebufferReadback)

      frag_builder += "#define BLEND_WITH_PREVIOUS_LAYER\n";

      frag_builder += "#define BLEND_WITH_PREVIOUS_LAYER\n";

  }

  }