Update to OpenXR 1.0.20

GodotVR · Nov 18, 2021 · f60a85a · f60a85a
1 parent 930b2d0
commit f60a85a
Show file tree

Hide file tree

Showing 96 changed files with 823 additions and 1,598 deletions.
diff --git a/.github/workflows/build-on-push.yml b/.github/workflows/build-on-push.yml
@@ -125,7 +125,7 @@ jobs:
           name: build-files-windows
           path: |
             demo/addons/godot-openxr/bin/win64/libgodot_openxr.dll
-            thirdparty/openxr_loader/x64/bin/openxr_loader.dll
+            thirdparty/openxr_loader/native/x64/release/bin/openxr_loader.dll
         if: matrix.platform == 'windows'
 
       # for android, copy aar
@@ -160,7 +160,7 @@ jobs:
           cp -r godot_openxr/demo/addons/godot-openxr godot_openxr_plugin/addons
           cp build-files-linux/libgodot_openxr.so godot_openxr_plugin/addons/godot-openxr/bin/linux/libgodot_openxr.so
           cp build-files-windows/demo/addons/godot-openxr/bin/win64/libgodot_openxr.dll godot_openxr_plugin/addons/godot-openxr/bin/win64/libgodot_openxr.dll
-          cp build-files-windows/thirdparty/openxr_loader/x64/bin/openxr_loader.dll godot_openxr_plugin/addons/godot-openxr/bin/win64/openxr_loader.dll
+          cp build-files-windows/thirdparty/openxr_loader/native/x64/release/bin/openxr_loader.dll godot_openxr_plugin/addons/godot-openxr/bin/win64/openxr_loader.dll
           cp build-files-android/sharedLibs/release/arm64-v8a/* godot_openxr_plugin/addons/godot-openxr/bin/android/
           # cp build-files-android/outputs/aar/*.aar godot_openxr_plugin/addons/godot-openxr/bin/android/
           # cp godot_openxr/android/godot_openxr.gdap godot_openxr_plugin/addons/godot-openxr/bin/android/godot_openxr.gdap

diff --git a/SConstruct b/SConstruct
@@ -53,15 +53,16 @@ if env['platform'] == "windows":
     target_path += "win64/"
     godot_cpp_library += '.windows'
     openxr_include_path += env['openxr_loader_path'] + "include/"
-    openxr_library_path += env['openxr_loader_path'] + "x64/lib"
+    openxr_library_path += env['openxr_loader_path'] + "native/x64/release/lib"
 
     # copy our loaded dll
-    openxr_loader_dll_source = env['openxr_loader_path'] + "x64/bin/openxr_loader.dll"
+    openxr_loader_dll_source = env['openxr_loader_path'] + "native/x64/release/bin/openxr_loader.dll"
     openxr_loader_dll_target = target_path + "openxr_loader.dll"
 
-    if env['target'] in ('debug', 'd'):
-        openxr_loader_pdb_source = env['openxr_loader_path'] + "x64/bin/openxr_loader.pdb"
-        openxr_loader_pdb_target = target_path + "openxr_loader.pdb"
+    # no longer includes this in 1.0.20...
+    #if env['target'] in ('debug', 'd'):
+    #    openxr_loader_pdb_source = env['openxr_loader_path'] + "x64/bin/openxr_loader.pdb"
+    #    openxr_loader_pdb_target = target_path + "openxr_loader.pdb"
 
     # Check some environment settings
     if env['use_llvm']:

diff --git a/demo/addons/godot-openxr/CHANGES.md b/demo/addons/godot-openxr/CHANGES.md
@@ -4,6 +4,7 @@ Changes to the Godot OpenXR asset
 1.1.1
 -------------------
 - Organised all third party resources into a thirdparty folder for easy maintenance.
+- Update to OpenXR 1.0.20
 
 1.1.0
 -------------------

diff --git a/thirdparty/README.md b/thirdparty/README.md
@@ -31,5 +31,5 @@ This is a copy of the Oculus OpenXR mobile SDK downloaded from [here](https://de
 This is a copy of the Khronos OpenXR loader library for Windows. We use the include files for all platforms.
 
 - Upstream: https://github.com/KhronosGroup/OpenXR-SDK/releases
-- Version 1.0.18
+- Version 1.0.20
 - License: Apache 2.0 or MIT
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_api_dump.dll b/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_api_dump.dll
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_api_dump.json b/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_api_dump.json
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_core_validation.dll b/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_core_validation.dll
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_core_validation.json b/thirdparty/openxr_loader/ARM64_uwp/bin/api_layers/XrApiLayer_core_validation.json
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/hello_xr.exe b/thirdparty/openxr_loader/ARM64_uwp/bin/hello_xr.exe
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/openxr_loader.dll b/thirdparty/openxr_loader/ARM64_uwp/bin/openxr_loader.dll
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/openxr_loader.pdb b/thirdparty/openxr_loader/ARM64_uwp/bin/openxr_loader.pdb
diff --git a/thirdparty/openxr_loader/ARM64_uwp/bin/openxr_runtime_list.exe b/thirdparty/openxr_loader/ARM64_uwp/bin/openxr_runtime_list.exe
diff --git a/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRConfig.cmake b/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRConfig.cmake
diff --git a/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRConfigVersion.cmake b/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRConfigVersion.cmake
diff --git a/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRTargets-relwithdebinfo.cmake b/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRTargets-relwithdebinfo.cmake
diff --git a/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRTargets.cmake b/thirdparty/openxr_loader/ARM64_uwp/lib/cmake/openxr/OpenXRTargets.cmake
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_api_dump.dll b/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_api_dump.dll
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_api_dump.json b/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_api_dump.json
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_core_validation.dll b/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_core_validation.dll
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_core_validation.json b/thirdparty/openxr_loader/ARM_uwp/bin/api_layers/XrApiLayer_core_validation.json
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/hello_xr.exe b/thirdparty/openxr_loader/ARM_uwp/bin/hello_xr.exe
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/openxr_loader.dll b/thirdparty/openxr_loader/ARM_uwp/bin/openxr_loader.dll
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/openxr_loader.pdb b/thirdparty/openxr_loader/ARM_uwp/bin/openxr_loader.pdb
diff --git a/thirdparty/openxr_loader/ARM_uwp/bin/openxr_runtime_list.exe b/thirdparty/openxr_loader/ARM_uwp/bin/openxr_runtime_list.exe
diff --git a/thirdparty/openxr_loader/ARM_uwp/lib/cmake/openxr/OpenXRConfig.cmake b/thirdparty/openxr_loader/ARM_uwp/lib/cmake/openxr/OpenXRConfig.cmake
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,6 +4,7 @@ Changes to the Godot OpenXR asset @@
 .1.1
     -------------------
     - Organised all third party resources into a thirdparty folder for easy maintenance.
+    - Update to OpenXR 1.0.20
 .1.0
     -------------------
@@ Expand Down @@