Skip to content

Commit

Permalink
Changes from OpenXR 1.1.41.
Browse files Browse the repository at this point in the history
GitOrigin-RevId: 4980d84000eb8b4d88c4fb29877c695526c94ca8
  • Loading branch information
rpavlik committed Sep 26, 2024
1 parent 9b676f9 commit 31430e7
Show file tree
Hide file tree
Showing 175 changed files with 87,313 additions and 1,175 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/android-cts-build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
lfs: true

- name: Get modern CMake and Ninja
uses: lukka/[email protected].2
uses: lukka/[email protected].3

- name: set up JDK 11
uses: actions/setup-java@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/android-cts-pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
lfs: true

- name: Get modern CMake and Ninja
uses: lukka/[email protected].2
uses: lukka/[email protected].3

- name: set up JDK 11
uses: actions/setup-java@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/msvc-build-preset.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Copyright 2021-2023, Collabora, Ltd.
# Copyright 2021-2024, Collabora, Ltd.
# SPDX-License-Identifier: CC0-1.0

on:
Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
lfs: true

- name: Get modern CMake and Ninja
uses: lukka/[email protected].2
uses: lukka/[email protected].3

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
Expand Down
1 change: 1 addition & 0 deletions .mailmap
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
# This mailmap is for **public repos** and should only be tested there.

Blake Taylor <[email protected]>
Bradley Austin Davis <[email protected]>
Bryce Hutchings <[email protected]>
Bryce Hutchings <[email protected]> <[email protected]>
Bryce Hutchings <[email protected]> <[email protected]>
Expand Down
10 changes: 10 additions & 0 deletions .reuse/dep5
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,16 @@ Copyright: 2011 by Morten S. Mikkelsen
License: Zlib
Comment: Unmodified, vendored copy of MikkTSpace commit 3e895b4

Files: src/external/basis_universal/*
Copyright: 2019-2021 Binomial LLC
License: Apache-2.0
Comment: Unmodified, vendored subset of basis_universal commit 1.16.4

Files: src/external/basis_universal/zstd/*
Copyright: 2016-2021, Yann Collet, Facebook, Inc.
License: BSD-3-Clause
Comment: Vendored copy of single-file libraries included in the basis_universal repo.

Files: src/external/jnipp/*
Copyright: 2016-2020, Mitchell Dowd
2020, Collabora, Ltd.
Expand Down
11 changes: 10 additions & 1 deletion BUILDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,16 @@ cd build/macos
cmake -G "Xcode" ../..
```

Finally, open the build/macos/OPENXR.xcodeproj in Xcode to build the samples.
Finally, open the `build/macos/OPENXR.xcodeproj` in Xcode to build the samples.

If you want to build on the command line, you can run the following command to
check available targets and built `ALL_BUILD` target as example:

```shell
# In build/macos directory
xcodebuild -list -project OPENXR.xcodeproj/
xcodebuild -scheme ALL_BUILD build
```

### Android

Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
cmake_minimum_required(VERSION 3.16)
project(OPENXR)

find_package(PythonInterp 3)
find_package(Python3 COMPONENTS Interpreter)
include(CTest)

# Enable IDE GUI folders. "Helper targets" that don't have interesting source code should set their FOLDER property to this
Expand All @@ -44,7 +44,7 @@ option(
OFF
)

if(BUILD_FORCE_GENERATION AND NOT PYTHON_EXECUTABLE)
if(BUILD_FORCE_GENERATION AND NOT Python3_EXECUTABLE)
message(FATAL_ERROR "BUILD_FORCE_GENERATION requires Python")
endif()

Expand Down
4 changes: 2 additions & 2 deletions COPYING.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

This document is shared across a number of OpenXR GitHub projects, as the
set of files in those projects is partially overlapping.
(There is a single "source of truth" internal Khronos GitLab repo these
(There is a single "source of truth" internal Khronos GitLab monorepo these
GitHub repositories interact with.)

== Licenses
Expand All @@ -17,7 +17,7 @@ https://reuse.software/spec/[REUSE 3.0 specification] with clear copyright
holders and license identifier listed for each file, preferably in each
file.
Where this is not possible, or e.g. when we are using files unmodified from
other open-source projects, license data is listed:
other open source projects, license data is listed:

* in an adjacent file of the same name, with the additional extension
"`.license`"
Expand Down
4 changes: 4 additions & 0 deletions changes/conformance/mr.3387.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- issue.2298.gl
---
Fix: Resolve D3D12 command list leak.
4 changes: 4 additions & 0 deletions changes/conformance/mr.3394.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- issue.2105.gl
---
- Improvement: Support KTX2 compressed textures in glTF files using basis universal, transcoding to GPU supported compressed textures where possible.
2 changes: 2 additions & 0 deletions changes/conformance/mr.3395.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
- Improvement: Split up glTF model loading, to allow the first stage to be asynchronous on the CPU.
- Improvement: In the glTF self-test, show a spinner while waiting for (pathological) models to load in a background thread.
5 changes: 5 additions & 0 deletions changes/conformance/mr.3437.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
- mr.3437.gl
- mr.3485.gl
---
Improvement: Add `ApproxEqual` functions to `xr_math_operators.h` to fix equality checks in the CTS.
1 change: 1 addition & 0 deletions changes/conformance/mr.3445.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Update codebase to use struct initialization convention for clarity.
1 change: 1 addition & 0 deletions changes/conformance/mr.3446.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix: Avoid crashes/errors when running in a headless mode.
1 change: 1 addition & 0 deletions changes/conformance/mr.3447.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Clarify/add (for consistency) some WARN messages in the CTS.
1 change: 1 addition & 0 deletions changes/conformance/mr.3467.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Remove confusing return value only used by dead code after a `FAIL`.
1 change: 1 addition & 0 deletions changes/conformance/mr.3474.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Refactor the d-pad extension test to fix issues and make it more consistent with other tests.
1 change: 1 addition & 0 deletions changes/conformance/mr.3477.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix: Resolve some thread races in the conformance layer as identified by TSAN.
1 change: 1 addition & 0 deletions changes/conformance/mr.3492.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix: IsViewConfigurationTypeEnumValid needs to check for XR_VERSION_1_1 when validating for XR_VIEW_CONFIGURATION_TYPE_PRIMARY_STEREO_WITH_FOVEATED_INSET
1 change: 1 addition & 0 deletions changes/conformance/mr.3500.gl.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Improvement: Warning fixes.
4 changes: 4 additions & 0 deletions changes/conformance/pr.486.gh.OpenXR-SDK-Source.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
---
- mr.3472.gl
---
Improvement: Migrate CMake build system away from using `find_package(PythonInterpreter)`, deprecated since CMake 3.12. Use `find_package(Python3 COMPONENTS Interpreter)` instead.
2 changes: 1 addition & 1 deletion include/openxr/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ else()
OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${output}"
COMMAND
"${CMAKE_COMMAND}" -E env "PYTHONPATH=${CODEGEN_PYTHON_PATH}"
"${PYTHON_EXECUTABLE}"
"${Python3_EXECUTABLE}"
"${PROJECT_SOURCE_DIR}/specification/scripts/genxr.py" -registry
"${PROJECT_SOURCE_DIR}/specification/registry/xr.xml" -o
"${CMAKE_CURRENT_BINARY_DIR}" ${output}
Expand Down
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.40
SPECREVISION = 1.1.41
REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))

Expand Down
Loading

0 comments on commit 31430e7

Please sign in to comment.