Skip to content

Commit

Permalink
Changes from OpenXR 1.1.45.
Browse files Browse the repository at this point in the history
GitOrigin-RevId: 2f14f9d9ec0d6ef12a66266660fa2650f6711628
  • Loading branch information
rpavlik committed Feb 5, 2025
1 parent 6b38a91 commit 90a41e5
Show file tree
Hide file tree
Showing 233 changed files with 3,172 additions and 1,194 deletions.
8 changes: 4 additions & 4 deletions .github/scripts/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"inherits": "win32",
"cacheVariables": {
"CMAKE_SYSTEM_NAME": "WindowsStore",
"CMAKE_SYSTEM_VERSION": "10.0"
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
}
},
{
Expand All @@ -45,7 +45,7 @@
"inherits": "x64",
"cacheVariables": {
"CMAKE_SYSTEM_NAME": "WindowsStore",
"CMAKE_SYSTEM_VERSION": "10.0"
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
}
},
{
Expand All @@ -54,7 +54,7 @@
"architecture": "ARM",
"cacheVariables": {
"CMAKE_SYSTEM_NAME": "WindowsStore",
"CMAKE_SYSTEM_VERSION": "10.0"
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
}
},
{
Expand All @@ -63,7 +63,7 @@
"architecture": "ARM64",
"cacheVariables": {
"CMAKE_SYSTEM_NAME": "WindowsStore",
"CMAKE_SYSTEM_VERSION": "10.0"
"CMAKE_SYSTEM_VERSION": "10.0.22000.0"
}
},
{
Expand Down
2 changes: 1 addition & 1 deletion .github/scripts/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

VS_VERSION = "Visual Studio 17 2022"

PLATFORMS = ("Win32", "x64", "ARM", "ARM64")
PLATFORMS = ("Win32", "x64", "ARM64") # "ARM",

TRUE_FALSE = (True, False)

Expand Down
19 changes: 14 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,25 @@ if(BASH_COMMAND AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/specification/Makefile")
endif()

if(ANDROID AND INSTALL_TO_ARCHITECTURE_PREFIXES)
set(LICENSE_DEST META-INF)
else()
set(LICENSE_DEST share/doc/openxr)
endif()

if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE")
install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
DESTINATION META-INF
DESTINATION ${LICENSE_DEST}
COMPONENT License
)

else()
elseif(EXISTS "${CMAKE_SOURCE_DIR}/../../../../LICENSES/Apache-2.0.txt")
# Building from a sources jar, where we omit that single file
# to avoid confusion regarding the combination of licenses in the sources.
# But for consistency, we will put it in the binaries.
install(
FILES "${CMAKE_CURRENT_SOURCE_DIR}/LICENSE"
DESTINATION share/doc/openxr
FILES "${CMAKE_SOURCE_DIR}/../../../../LICENSES/Apache-2.0.txt"
RENAME LICENSE
DESTINATION ${LICENSE_DEST}
COMPONENT License
)
endif()
1 change: 1 addition & 0 deletions changes/conformance/mr.2200.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
New test: Non-interactive test for `XR_EXT_frame_synthesis`
5 changes: 5 additions & 0 deletions changes/conformance/mr.3400.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
- mr.3400.gl
- mr.3655.gl
---
- New test: Verify that runtimes handle edge cases around `XrSystemGraphicsProperties::maxLayerCount` noninteractively, and interactively verify that multiple projection and quad layers are rendered as expected.
6 changes: 6 additions & 0 deletions changes/conformance/mr.3421.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
- mr.3421.gl
- mr.3665.gl
- mr.3671.gl
---
Improvement: Code cleanup.
4 changes: 4 additions & 0 deletions changes/conformance/mr.3428.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- issue.2312
---
- Improvement: Modify SubImage test to include a y offset test
7 changes: 7 additions & 0 deletions changes/conformance/mr.3466.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
- issue.2315.gl
- issue.2419.gl
- mr.3466.gl
- mr.3652.gl
---
- Improvement: Validate more action and action set names. Explicitly allow . and .. as action set names.
2 changes: 2 additions & 0 deletions changes/conformance/mr.3563.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Improvement: Adjust handling of disconnectable devices.
- Improvement: Improve maintainability by separating `GlobalData` and `Options` further, and migrate most argument parsing into `Options` directly.
1 change: 1 addition & 0 deletions changes/conformance/mr.3588.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Tidy up test for `XR_EXT_eye_gaze_interaction` and correct erroneous messages.
5 changes: 5 additions & 0 deletions changes/conformance/mr.3595.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
- mr.3595.gl
- mr.3679.gl
---
New test: Add test which enables all graphics bindings extensions supported for the runtime.
4 changes: 4 additions & 0 deletions changes/conformance/mr.3618.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- mr.3618.gl
---
Improvement: Add warning for xrEnumerateSwapchainFormats returned formats being in numerical order.
2 changes: 2 additions & 0 deletions changes/conformance/mr.3630.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Fix: Handling Android Intent extras with embedded commas.
- Improvement: Adds support for "enabledInstanceExtension" and "interactionProfiles" intent values (lists).
1 change: 1 addition & 0 deletions changes/conformance/mr.3638.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Add swapchain vector clear for consistency.
1 change: 1 addition & 0 deletions changes/conformance/mr.3640.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Update Gradle from 7.5 to to 8.5, and Android Gradle Plugin to 8.1.4.
1 change: 1 addition & 0 deletions changes/conformance/mr.3641.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Save more contextual data from hand tracking test, to ease troubleshooting.
1 change: 1 addition & 0 deletions changes/conformance/mr.3643.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Make invalid handle tests for actions match other similar tests.
1 change: 1 addition & 0 deletions changes/conformance/mr.3644.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Add instructions for automated execution during development and internal runtime testing.
2 changes: 2 additions & 0 deletions changes/conformance/mr.3645.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Improvement: Code cleanup to improve consistency and maintainability.

2 changes: 2 additions & 0 deletions changes/conformance/mr.3646.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
Improvement: Clean up and slightly tighten test conditions for composition layer tests.

1 change: 1 addition & 0 deletions changes/conformance/mr.3656.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix: Regression in `xrGetInstanceProcAddr` test when running on a 1.0 runtime or in 1.0 mode.
1 change: 1 addition & 0 deletions changes/conformance/mr.3657.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Clarify that **all tests** must pass for a runtime to be considered conformant, not just those corresponding to core or KHR functionality.
2 changes: 1 addition & 1 deletion specification/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ endif
VERSIONS := XR_VERSION_1_0 XR_VERSION_1_1 XR_LOADER_VERSION_1_0
VERSIONOPTIONS := $(foreach version,$(VERSIONS),-feature $(version))

SPECREVISION = 1.1.43
SPECREVISION = 1.1.45
REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))

Expand Down
Loading

0 comments on commit 90a41e5

Please sign in to comment.