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

Upgraded openxr dependency to 1.1.41. #823

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
+6 −61
Open

Upgraded openxr dependency to 1.1.41. #823

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f0be99
Upgraded openxr dependency to 1.1.41.
galibzon Feb 3, 2025
787b7cd
Updated SHA256 according to github job results
galibzon Feb 4, 2025
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
11 changes: 2 additions & 9 deletions Gems/OpenXRVk/3rdParty/Platform/Android/BuiltInPackages_android.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,5 @@
#
#

set(ANDROID_USE_OCULUS_OPENXR OFF CACHE BOOL "When ON it uses OpenXR library from Oculus SDK.")

if(ANDROID_USE_OCULUS_OPENXR)
include(${CMAKE_CURRENT_LIST_DIR}/FindOpenXROculus.cmake)
set(openxr_dependency 3rdParty::OpenXROculus)
else()
ly_associate_package(PACKAGE_NAME OpenXR-1.0.22-rev1-android TARGETS OpenXR PACKAGE_HASH 1227204583ce224c7e3843e82bb36deb576df6b458eecce46740cb8941902f21)
set(openxr_dependency 3rdParty::OpenXR)
endif()
ly_associate_package(PACKAGE_NAME OpenXR-1.1.41-rev1-android TARGETS OpenXR PACKAGE_HASH 7f2c29d109947b85e70bedc3c63a0b1b758f3c4113a1d127e7fa799912bcd15e)
set(openxr_dependency 3rdParty::OpenXR)
42 changes: 0 additions & 42 deletions Gems/OpenXRVk/3rdParty/Platform/Android/FindOpenXROculus.cmake
View file
Open in desktop

This file was deleted.

4 changes: 2 additions & 2 deletions Gems/OpenXRVk/3rdParty/Platform/Windows/BuiltInPackages_windows.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
#
#

ly_associate_package(PACKAGE_NAME OpenXR-1.0.22-rev1-windows TARGETS OpenXR PACKAGE_HASH 55235d77253efe1af046a4a3e7dd7a8e5f6768401326d5e077c827cce323cd11)

ly_associate_package(PACKAGE_NAME OpenXR-1.1.41-rev1-windows TARGETS OpenXR PACKAGE_HASH 425a45a6a4f6a80471a18346b9f47e1a2b935c6fefce2d189abfc5b617d50281)
set(openxr_dependency 3rdParty::OpenXR)

7 changes: 0 additions & 7 deletions Gems/OpenXRVk/External/OculusOpenXRMobileSDK/README.md
View file
Open in desktop

This file was deleted.

3 changes: 2 additions & 1 deletion Projects/OpenXRTest/Registry/autoexec.game.setreg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
"O3DE": {
"Autoexec": {
"ConsoleCommands": {
"LoadLevel": "DefaultLevel"
//"LoadLevel": "DefaultLevel"
"LoadLevel": "XR_Office"
}
}
}
Expand Down