From 3235a46619b9dae654ed967ec308eda7f3b3bdc1 Mon Sep 17 00:00:00 2001
From: zarik5 <riccardo.zaglia5@gmail.com>
Date: Sun, 21 Jul 2024 17:03:57 +0200
Subject: [PATCH] build(xtask): :arrow_up: Update XR loaders (#2270)

---
 alvr/client_openxr/src/lib.rs  | 10 +++++-----
 alvr/xtask/src/dependencies.rs | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/alvr/client_openxr/src/lib.rs b/alvr/client_openxr/src/lib.rs
index bb2d333c8b..de7b969d8e 100644
--- a/alvr/client_openxr/src/lib.rs
+++ b/alvr/client_openxr/src/lib.rs
@@ -121,11 +121,7 @@ pub fn entry_point() {
     let platform = alvr_client_core::platform();
 
     let loader_suffix = match platform {
-        Platform::Quest1
-        | Platform::Quest2
-        | Platform::Quest3
-        | Platform::QuestPro
-        | Platform::QuestUnknown => "_quest",
+        Platform::Quest1 => "_quest1",
         Platform::PicoNeo3 | Platform::Pico4 => "_pico",
         Platform::Yvr => "_yvr",
         Platform::Lynx => "_lynx",
@@ -139,6 +135,7 @@ pub fn entry_point() {
     xr_entry.initialize_android_loader().unwrap();
 
     let available_extensions = xr_entry.enumerate_extensions().unwrap();
+    alvr_common::info!("OpenXR available extensions: {available_extensions:#?}");
 
     // todo: switch to vulkan
     assert!(available_extensions.khr_opengl_es_enable);
@@ -167,6 +164,9 @@ pub fn entry_point() {
     exts.khr_convert_timespec_time = true;
     exts.khr_opengl_es_enable = true;
 
+    let available_layers = xr_entry.enumerate_layers().unwrap();
+    alvr_common::info!("OpenXR available layers: {available_layers:#?}");
+
     let xr_instance = xr_entry
         .create_instance(
             &xr::ApplicationInfo {
diff --git a/alvr/xtask/src/dependencies.rs b/alvr/xtask/src/dependencies.rs
index 030feb34f3..f1ca4050ad 100644
--- a/alvr/xtask/src/dependencies.rs
+++ b/alvr/xtask/src/dependencies.rs
@@ -315,14 +315,14 @@ fn get_android_openxr_loaders() {
         "",
         &format!(
             "https://github.com/KhronosGroup/OpenXR-SDK-Source/releases/download/{}",
-            "release-1.0.27/openxr_loader_for_android-1.0.27.aar",
+            "release-1.1.38/openxr_loader_for_android-1.1.38.aar",
         ),
         "prefab/modules/openxr_loader/libs/android.arm64-v8a",
     );
 
     get_openxr_loader(
-        "_quest",
-        "https://securecdn.oculus.com/binaries/download/?id=7092833820755144", // version 60
+        "_quest1",
+        "https://securecdn.oculus.com/binaries/download/?id=7577210995650755", // Version 64
         "OpenXR/Libs/Android/arm64-v8a/Release",
     );
 
@@ -334,8 +334,8 @@ fn get_android_openxr_loaders() {
 
     get_openxr_loader(
         "_yvr",
-        "https://developer.yvrdream.com/yvrdoc/sdk/openxr/yvr_openxr_mobile_sdk_1.0.0.zip",
-        "yvr_openxr_mobile_sdk_1.0.0/OpenXR/Libs/Android/arm64-v8a",
+        "https://developer.yvrdream.com/yvrdoc/sdk/openxr/yvr_openxr_mobile_sdk_2.0.0.zip",
+        "yvr_openxr_mobile_sdk_2.0.0/OpenXR/Libs/Android/arm64-v8a",
     );
 
     get_openxr_loader(