-
Notifications
You must be signed in to change notification settings - Fork 263
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Patch release for the 1.0 series. Note: Changelogs are now being assembled with the help of the Proclamation tool, so the format has changed somewhat. Registry Introduce XR_MSFT_hand_interaction extension for hand interaction profile. (internal MR 1601) Introduce XR_EPIC_view_configuration_fov extension for system field-of-view queries. (internal MR 1170) Indicate that xrBeginFrame returns XR_ERROR_CALL_ORDER_INVALID when not paired with a corresponding xrWaitFrame call. (internal MR 1673) Update the version number of XR_KHR_D3D12_enable extension. (internal MR 1681) Introduce XR_EXTX_overlay extension for Overlay sessions (which can provide overlay composition layers). (internal MR 1665) SDK loader: Add linker export map/version script to avoid exporting implementation symbols from C++ on non-MSVC platforms. (internal MR 1641, OpenXR- SDK-Source/#159) Add tracking and destruction of debug messengers in the loader. (internal MR 1668, OpenXR-SDK-Source/#29, internal issue 1284) Fix issue in hello_xr breaking the build in certain limited conditions. (OpenXR-SDK-Source/#170) Add initial (partial) Android support for hello_xr. (internal MR 1680) Fix a mismatched type signature, breaking compiles of hello_xr in at least some Linux environments. (OpenXR-SDK-Source/#164, internal MR 166) Explicitly link in advapi32 for many of the APIs the loader uses on Windows, needed when building for ARM/ARM64 (non-UWP only). (internal MR 1664) Remove "Dev Build" string from loader resources and fix version. (internal MR 1664) Add manual pages for openxr_runtime_list and hello_xr (based on their --help), and install in the standard location on non-Windows platforms. (OpenXR-SDK-Source/#169) Silence some noisy warnings in hello_xr and the layers. (OpenXR-SDK-Source/#165)
- Loading branch information
Showing
49 changed files
with
1,214 additions
and
498 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| #!/usr/bin/env bash | ||
| # Copyright 2020, Collabora, Ltd. | ||
| # SPDX-License-Identifier: Apache-2.0 | ||
|
|
||
| set -e | ||
|
|
||
| if [ $# -eq 0 ]; then | ||
| TOPIC=HEAD | ||
| MASTER=origin/master | ||
| elif [ $# -eq 1 ]; then | ||
| TOPIC=$1 | ||
| MASTER=origin/master | ||
| elif [ $# -eq 2 ]; then | ||
| TOPIC=$1 | ||
| MASTER=$2 | ||
| else | ||
| echo "$0 [<topic_branch> [<master_branch>]]" >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| BASE=$(git merge-base "${MASTER}" "${TOPIC}") | ||
| export TOPIC | ||
| export BASE | ||
|
|
||
| echo "Topic branch: $TOPIC" | ||
| echo "Compared against target branch: $MASTER" | ||
| echo "Merge base: $BASE" | ||
| echo "" | ||
| echo "" | ||
|
|
||
| changes_in_tree() { | ||
| if ! git diff --exit-code "${BASE}..${TOPIC}" -- "$@" > /dev/null; then | ||
| true | ||
| else | ||
| false | ||
| fi | ||
| } | ||
|
|
||
| check_tree_and_changelog() { | ||
| changelog_dir=$1 | ||
| shift | ||
| if changes_in_tree "$@"; then | ||
| if changes_in_tree $changelog_dir; then | ||
| echo "OK: Found changes in $@ and changelog fragment in $changelog_dir" | ||
| else | ||
| echo "Error: Found changes in $@ but no changelog fragment in $changelog_dir" | ||
| RESULT=false | ||
| export RESULT | ||
| fi | ||
| fi | ||
| } | ||
|
|
||
| ( | ||
| cd "$(dirname $0)/.." | ||
| RESULT=true | ||
| check_tree_and_changelog changes/sdk src/api_layers src/cmake src/common src/loader src/scripts src/tests specification/loader | ||
| check_tree_and_changelog changes/specification specification/sources | ||
| check_tree_and_changelog changes/registry specification/registry | ||
|
|
||
| if [ "x$CI_MERGE_REQUEST_ID" != "x" ]; then | ||
| # This is a CI build of a merge request. | ||
| echo "Merge request $CI_MERGE_REQUEST_IID" | ||
| if ! find changes -name "mr.$CI_MERGE_REQUEST_IID.gl.md" | grep -q "."; then | ||
| echo "Warning: Could not find a changelog fragment named mr.$CI_MERGE_REQUEST_IID.gl.md" | ||
| # RESULT=false | ||
| fi | ||
| fi | ||
| $RESULT | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.