Skip to content

Commit

Permalink
OpenXR SDK 1.1.41 (2024-09-25)
Browse files Browse the repository at this point in the history
This release features several new vendor extensions, as well as some
small improvements and fixes to the software.

-   Registry
    -   Change: Allow structs that can extend multiple other structs in
        the RelaxNG schema, as already permitted by the Vulkan schema.
        (internal MR 2869)
    -   New vendor extension: XR_HTC_body_tracking (internal MR 2549)
    -   New vendor extension: XR_ML_spatial_anchors (internal MR 2803)
    -   New vendor extension: XR_ML_spatial_anchors_storage (internal MR
        2804)
    -   New vendor extension: XR_ML_system_notifications (internal MR
        2946)
    -   New vendor extension: XR_ML_world_mesh_detection (internal MR
        2950)
    -   New vendor extension:
        XR_ML_view_configuration_depth_range_change (internal MR 3036)
-   SDK
    -   Fix: Do not enforce overly-strict requirements on structs using
        *BaseHeader types in the code generation scripts, fixing a
        build-time warning for the layers. (internal MR 3434)
    -   Improvement: Migrate CMake build system away from using
        find_package(PythonInterpreter), deprecated since CMake 3.12.
        Use find_package(Python3 COMPONENTS Interpreter) instead.
        (OpenXR-SDK-Source PR 486, internal MR 3472)
    -   Validation layer: Improvement: Clean up generate_vuid_database
        script, used to analyze the validation layer. (internal MR 2895)
    -   ci: Remove now-redundant gradle-wrapper-validation job from
        GitHub Actions (OpenXR-SDK-Source PR 500)
    -   ci: Add GitHub Action for macOS building (OpenXR-SDK-Source PR
        501)
    -   doc: Add command to build OpenXR targets on macOS
        (OpenXR-SDK-Source PR 501)
    -   hello_xr: Addition: Log Vulkan extensions requested by runtime
        and by app, visible when running with --verbose.
        (OpenXR-SDK-Source PR 403)

GitOrigin-RevId: 4980d84000eb8b4d88c4fb29877c695526c94ca8
  • Loading branch information
rpavlik committed Sep 26, 2024
1 parent 67cfb6a commit 7d1c096
Show file tree
Hide file tree
Showing 21 changed files with 2,136 additions and 59 deletions.
6 changes: 3 additions & 3 deletions .appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# SPDX-License-Identifier: Apache-2.0

version: 1.1.40.{build}
version: 1.1.41.{build}
image: Visual Studio 2017


Expand Down Expand Up @@ -45,9 +45,9 @@ install:
build_script:
- cmd: >-
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" &&
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DPython3_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
ninja -C build
- cmd: >-
call "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Community\\VC\\Auxiliary\\Build\\%VCVARS%.bat" &&
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDYNAMIC_LOADER=ON -DPYTHON_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
cmake -GNinja -Bbuild -H. -DCMAKE_BUILD_TYPE=RelWithDebInfo -DDYNAMIC_LOADER=ON -DPython3_EXECUTABLE=C:/Python37-x64/python.exe -DBUILD_ALL_EXTENSIONS=ON &&
ninja -C build
8 changes: 8 additions & 0 deletions .git-blame-ignore-revs
Original file line number Diff line number Diff line change
Expand Up @@ -65,3 +65,11 @@ e774b36cfc7bfc721e97de6c8435fcb14866e6fa

# OpenXR-SDK
db11d03216666f2b574da46a39c4b565dbe90124

## 1.1.40 - Update to clang-format-14

# Khronos GitLab
22ba5c7abe1f43122d1eedebc093008d03aaad03

# OpenXR-CTS
e3ab3214c1307d60642ee939739740f5111bbb54
9 changes: 5 additions & 4 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
- uses: actions/checkout@v4
- name: Get modern CMake and Ninja
uses: "lukka/get-cmake@v3.30.1"
uses: "lukka/get-cmake@v3.30.3"

# Do this before building aar since it affects the version
- name: Touch SNAPSHOT marker file
Expand All @@ -36,7 +36,7 @@ jobs:
run: "./maintainer-scripts/build-aar.sh"

- name: Upload bare AAR
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: AAR and POM
path: openxr_loader_for_android*
Expand All @@ -47,12 +47,13 @@ jobs:
steps:
- uses: "actions/checkout@v4"
- name: "Get modern CMake and Ninja"
uses: "lukka/get-cmake@v3.30.1"
uses: "lukka/get-cmake@v3.30.3"
- name: "set up JDK 11"
uses: "actions/setup-java@v4"
with:
java-version: "11"
distribution: "temurin"
# Also performs Gradle wrapper validation
- uses: "gradle/actions/setup-gradle@v4"

# HelloXR OpenGLES version
Expand All @@ -61,7 +62,7 @@ jobs:

- name: Upload HelloXR OpenGLES (debug) for Android
if: "!inputs.release"
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: HelloXR OpenGLES Android
path: "src/tests/hello_xr/build/outputs/apk/OpenGLES/debug/*.apk"
2 changes: 1 addition & 1 deletion .github/workflows/check_clang_format_and_codespell.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
if: ${{ failure() }}
- name: Publish diff
if: ${{ failure() }}
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
path: ${{ runner.temp }}/clang-format.patch
name: clang-format-changes
Expand Down
6 changes: 3 additions & 3 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/get-cmake@v3.30.1
uses: lukka/get-cmake@v3.30.3

- name: Add msbuild to PATH
uses: microsoft/setup-msbuild@v2
Expand All @@ -57,7 +57,7 @@ jobs:
run: "cmake --build $env:RUNNER_TEMP --parallel --config ${{ inputs.buildType }} --target install"

- name: Upload Artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
if: inputs.artifactName
with:
name: "${{ inputs.artifactName }}"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/windows-matrix.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,15 +50,15 @@ jobs:
- uses: "actions/checkout@v4"

- name: Retrieve artifacts
uses: "actions/download-artifact@v3"
uses: "actions/download-artifact@v4"
with:
path: artifacts

- name: Organize artifacts
run: 'python .github/scripts/organize_windows_artifacts.py "${{ github.workspace }}" "${{ github.workspace }}/openxr_loader"'

- name: Upload combined artifact
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: openxr_loader_windows
path: "${{ github.workspace }}/openxr_loader"
Expand All @@ -78,7 +78,7 @@ jobs:
run: 'nuget pack "${{ github.workspace }}/openxr_loader_staging/OpenXR.Loader.nuspec" -OutputDirectory "${{ github.workspace }}/nuget"'

- name: Upload NuGet artifact
uses: "actions/upload-artifact@v3"
uses: "actions/upload-artifact@v4"
with:
name: NuGet
path: "${{ github.workspace }}/nuget"
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 <rotaylor@magicleap.com>
Bradley Austin Davis <bdavis@saintandreas.org>
Bryce Hutchings <bryceh@microsoft.com>
Bryce Hutchings <bryceh@microsoft.com> <5100250+brycehutchings@users.noreply.github.com>
Bryce Hutchings <bryceh@microsoft.com> <me@bryce.ws>
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
44 changes: 44 additions & 0 deletions CHANGELOG.SDK.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,50 @@ along with any public pull requests that have been accepted.
In this repository in particular, since it is primarily software,
pull requests may be integrated as they are accepted even between periodic updates.

## OpenXR SDK 1.1.41 (2024-09-25)

This release features several new vendor extensions, as well as some small
improvements and fixes to the software.

- Registry
- Change: Allow structs that can extend multiple other structs in the RelaxNG
schema, as already permitted by the Vulkan schema.
([internal MR 2869](https://gitlab.khronos.org/openxr/openxr/merge_requests/2869))
- New vendor extension: `XR_HTC_body_tracking`
([internal MR 2549](https://gitlab.khronos.org/openxr/openxr/merge_requests/2549))
- New vendor extension: `XR_ML_spatial_anchors`
([internal MR 2803](https://gitlab.khronos.org/openxr/openxr/merge_requests/2803))
- New vendor extension: `XR_ML_spatial_anchors_storage`
([internal MR 2804](https://gitlab.khronos.org/openxr/openxr/merge_requests/2804))
- New vendor extension: `XR_ML_system_notifications`
([internal MR 2946](https://gitlab.khronos.org/openxr/openxr/merge_requests/2946))
- New vendor extension: `XR_ML_world_mesh_detection`
([internal MR 2950](https://gitlab.khronos.org/openxr/openxr/merge_requests/2950))
- New vendor extension: `XR_ML_view_configuration_depth_range_change`
([internal MR 3036](https://gitlab.khronos.org/openxr/openxr/merge_requests/3036))
- SDK
- Fix: Do not enforce overly-strict requirements on structs using `*BaseHeader`
types in the code generation scripts, fixing a build-time warning for the
layers.
([internal MR 3434](https://gitlab.khronos.org/openxr/openxr/merge_requests/3434))
- Improvement: Migrate CMake build system away from using
`find_package(PythonInterpreter)`, deprecated since CMake 3.12. Use
`find_package(Python3 COMPONENTS Interpreter)` instead.
([OpenXR-SDK-Source PR 486](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/486),
[internal MR 3472](https://gitlab.khronos.org/openxr/openxr/merge_requests/3472))
- Validation layer: Improvement: Clean up `generate_vuid_database` script, used
to analyze the validation layer.
([internal MR 2895](https://gitlab.khronos.org/openxr/openxr/merge_requests/2895))
- ci: Remove now-redundant gradle-wrapper-validation job from GitHub Actions
([OpenXR-SDK-Source PR 500](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/500))
- ci: Add GitHub Action for macOS building
([OpenXR-SDK-Source PR 501](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/501))
- doc: Add command to build OpenXR targets on macOS
([OpenXR-SDK-Source PR 501](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/501))
- hello_xr: Addition: Log Vulkan extensions requested by runtime and by app,
visible when running with `--verbose`.
([OpenXR-SDK-Source PR 403](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/403))

## OpenXR SDK 1.1.40 (2024-08-22)

This release features a new ratified graphics API binding extension,
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
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
Loading

0 comments on commit 7d1c096

Please sign in to comment.