Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build(xtask): ⬆️ Update XR loaders #2270

Merged
merged 1 commit into from
Jul 21, 2024
Merged

build(xtask): ⬆️ Update XR loaders #2270

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions alvr/client_openxr/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
The-personified-devil marked this conversation as resolved.
Show resolved Hide resolved
Platform::PicoNeo3 | Platform::Pico4 => "_pico",
Platform::Yvr => "_yvr",
Platform::Lynx => "_lynx",
Expand All @@ -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:#?}");
The-personified-devil marked this conversation as resolved.
Show resolved Hide resolved

// todo: switch to vulkan
assert!(available_extensions.khr_opengl_es_enable);
Expand Down Expand Up @@ -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:#?}");
The-personified-devil marked this conversation as resolved.
Show resolved Hide resolved

let xr_instance = xr_entry
.create_instance(
&xr::ApplicationInfo {
Expand Down
10 changes: 5 additions & 5 deletions alvr/xtask/src/dependencies.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
);

Expand All @@ -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(
Expand Down
Loading