diff options
46 files changed, 194 insertions, 30 deletions
diff --git a/CHANGELOG.SDK.md b/CHANGELOG.SDK.md index 2a1a56a..5646833 100644 --- a/CHANGELOG.SDK.md +++ b/CHANGELOG.SDK.md @@ -13,6 +13,34 @@ 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.0.8 (2020-03-27) + +Patch release for the 1.0 series. + +- Registry + - `XR_EXTX_overlay`: upgrade overlay bit names to match the convention, and + increase extension version number. This is a **source-incompatible change** to + a provisional multi-vendor extension. + ([internal MR 1697](https://gitlab.khronos.org/openxr/openxr/merge_requests/1697), + [internal issue 1318](https://gitlab.khronos.org/openxr/openxr/issues/1318), + [internal issue 42](https://gitlab.khronos.org/openxr/openxr/issues/42), + [internal MR 171](https://gitlab.khronos.org/openxr/openxr/merge_requests/171)) + - Introduce `XR_EXT_eye_gaze_interaction` extension for eye gaze interaction + profile. + ([internal MR 1556](https://gitlab.khronos.org/openxr/openxr/merge_requests/1556)) + - Add SPDX license identifier tag to registry schema. + ([internal MR 1686](https://gitlab.khronos.org/openxr/openxr/merge_requests/1686)) + - Add missing error codes to `xrCreateActionSet`, `xrCreateAction`, and + `xrGetInputSourceLocalizedName`. + ([internal MR 1698](https://gitlab.khronos.org/openxr/openxr/merge_requests/1698)) +- SDK + - Add SPDX license identifier tags to nearly all (code) files, including + generated files. + ([internal MR 1686](https://gitlab.khronos.org/openxr/openxr/merge_requests/1686)) + - Fix build system behavior with MSVC building in Release mode: only attempt + to copy PDB files if they exist. + ([internal MR 1701](https://gitlab.khronos.org/openxr/openxr/merge_requests/1701)) + ## OpenXR SDK 1.0.7 (2020-03-20) Patch release for the 1.0 series. @@ -37,9 +65,9 @@ changed somewhat. ([internal MR 1665](https://gitlab.khronos.org/openxr/openxr/merge_requests/1665)) - SDK - loader: Add linker export map/version script to avoid exporting implementation - symbols from C++ on non-MSVC platforms. ([internal MR - 1641](https://gitlab.khronos.org/openxr/openxr/merge_requests/1641), [OpenXR- - SDK-Source/#159](https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/159)) + symbols from C++ on non-MSVC platforms. + ([internal MR 1641](https://gitlab.khronos.org/openxr/openxr/merge_requests/1641), + [OpenXR-SDK-Source/#159](https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/159)) - Add tracking and destruction of debug messengers in the loader. ([internal MR 1668](https://gitlab.khronos.org/openxr/openxr/merge_requests/1668), [OpenXR-SDK-Source/#29](https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/29), diff --git a/CMakeLists.txt b/CMakeLists.txt index 877e59a..6681356 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (c) 2017-2020 The Khronos Group Inc. # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/doc/loader/OpenXR_loader_design.html b/doc/loader/OpenXR_loader_design.html index 7796b5e..41dc170 100644 --- a/doc/loader/OpenXR_loader_design.html +++ b/doc/loader/OpenXR_loader_design.html @@ -443,9 +443,9 @@ body.book #toc,body.book #preamble,body.book h1.sect0,body.book .sect1>h2{page-b <h1>OpenXR<sup>®</sup> Loader - Design and Operation [DRAFT] (with all published extensions)</h1> <div class="details"> <span id="author" class="author">Copyright (c) 2017-2020 The Khronos Group Inc.</span><br> -<span id="revnumber">version 1.0.7,</span> -<span id="revdate">Sat, 21 Mar 2020 02:02:08 +0000</span> -<br><span id="revremark">from git ref release-1.0.7 commit: 95b25e179a1a9d179d2222086b8e104a6d415c25</span> +<span id="revnumber">version 1.0.8,</span> +<span id="revdate">Sat, 28 Mar 2020 02:10:55 +0000</span> +<br><span id="revremark">from git ref release-1.0.8 commit: 0207c8e7a2f788ad42896949a3eb9f1819b2948f</span> </div> <div id="toc" class="toc2"> <div id="toctitle">Table of Contents</div> @@ -5561,8 +5561,8 @@ ease of discovery.</p> </div> <div id="footer"> <div id="footer-text"> -Version 1.0.7<br> -Last updated 2020-03-21 01:59:49 UTC +Version 1.0.8<br> +Last updated 2020-03-28 02:08:04 UTC </div> </div> <script type="text/x-mathjax-config"> diff --git a/include/CMakeLists.txt b/include/CMakeLists.txt index b43bb19..6fc4653 100644 --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (c) 2017 The Khronos Group Inc. # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/include/openxr/CMakeLists.txt b/include/openxr/CMakeLists.txt index a3e5e19..ac3c375 100644 --- a/include/openxr/CMakeLists.txt +++ b/include/openxr/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (c) 2017-2020 The Khronos Group Inc. # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/include/openxr/openxr.h b/include/openxr/openxr.h index 6d792a0..51959ed 100644 --- a/include/openxr/openxr.h +++ b/include/openxr/openxr.h @@ -4,6 +4,8 @@ /* ** Copyright (c) 2017-2020 The Khronos Group Inc. ** +** SPDX-License-Identifier: Apache-2.0 +** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. ** You may obtain a copy of the License at @@ -35,7 +37,7 @@ extern "C" { ((((major) & 0xffffULL) << 48) | (((minor) & 0xffffULL) << 32) | ((patch) & 0xffffffffULL)) // OpenXR current version number. -#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 7) +#define XR_CURRENT_API_VERSION XR_MAKE_VERSION(1, 0, 8) #define XR_VERSION_MAJOR(version) (uint16_t)(((uint64_t)(version) >> 48)& 0xffffULL) #define XR_VERSION_MINOR(version) (uint16_t)(((uint64_t)(version) >> 32) & 0xffffULL) @@ -276,6 +278,8 @@ typedef enum XrStructureType { XR_TYPE_GRAPHICS_BINDING_D3D12_KHR = 1000028000, XR_TYPE_SWAPCHAIN_IMAGE_D3D12_KHR = 1000028001, XR_TYPE_GRAPHICS_REQUIREMENTS_D3D12_KHR = 1000028002, + XR_TYPE_SYSTEM_EYE_GAZE_INTERACTION_PROPERTIES_EXT = 1000030000, + XR_TYPE_EYE_GAZE_SAMPLE_TIME_EXT = 1000030001, XR_TYPE_VISIBILITY_MASK_KHR = 1000031000, XR_TYPE_EVENT_DATA_VISIBILITY_MASK_CHANGED_KHR = 1000031001, XR_TYPE_SESSION_CREATE_INFO_OVERLAY_EXTX = 1000033000, @@ -1536,18 +1540,35 @@ XRAPI_ATTR XrResult XRAPI_CALL xrSessionInsertDebugUtilsLabelEXT( #endif +#define XR_EXT_eye_gaze_interaction 1 +#define XR_EXT_eye_gaze_interaction_SPEC_VERSION 1 +#define XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME "XR_EXT_eye_gaze_interaction" +typedef struct XrSystemEyeGazeInteractionPropertiesEXT { + XrStructureType type; + void* XR_MAY_ALIAS next; + XrBool32 supportsEyeGazeInteraction; +} XrSystemEyeGazeInteractionPropertiesEXT; + +typedef struct XrEyeGazeSampleTimeEXT { + XrStructureType type; + void* XR_MAY_ALIAS next; + XrTime time; +} XrEyeGazeSampleTimeEXT; + + + #define XR_EXTX_overlay 1 -#define XR_EXTX_overlay_SPEC_VERSION 3 +#define XR_EXTX_overlay_SPEC_VERSION 4 #define XR_EXTX_OVERLAY_EXTENSION_NAME "XR_EXTX_overlay" typedef XrFlags64 XrOverlaySessionCreateFlagsEXTX; // Flag bits for XrOverlaySessionCreateFlagsEXTX -static const XrOverlaySessionCreateFlagsEXTX XR_OVERLAY_SESSION_CREATE_RELAXED_DISPLAY_TIME_EXTX = 0x00000001; +static const XrOverlaySessionCreateFlagsEXTX XR_OVERLAY_SESSION_CREATE_RELAXED_DISPLAY_TIME_BIT_EXTX = 0x00000001; typedef XrFlags64 XrOverlayMainSessionFlagsEXTX; // Flag bits for XrOverlayMainSessionFlagsEXTX -static const XrOverlayMainSessionFlagsEXTX XR_MAIN_SESSION_BIT_ENABLED_COMPOSITION_LAYER_INFO_DEPTH_EXTX = 0x00000001; +static const XrOverlayMainSessionFlagsEXTX XR_OVERLAY_MAIN_SESSION_ENABLED_COMPOSITION_LAYER_INFO_DEPTH_BIT_EXTX = 0x00000001; typedef struct XrSessionCreateInfoOverlayEXTX { XrStructureType type; diff --git a/include/openxr/openxr_platform.h b/include/openxr/openxr_platform.h index ddca4d3..b92a2cc 100644 --- a/include/openxr/openxr_platform.h +++ b/include/openxr/openxr_platform.h @@ -4,6 +4,8 @@ /* ** Copyright (c) 2017-2020 The Khronos Group Inc. ** +** SPDX-License-Identifier: Apache-2.0 +** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. ** You may obtain a copy of the License at diff --git a/include/openxr/openxr_platform_defines.h b/include/openxr/openxr_platform_defines.h index dc128fc..a6d0d87 100644 --- a/include/openxr/openxr_platform_defines.h +++ b/include/openxr/openxr_platform_defines.h @@ -1,6 +1,8 @@ /* ** Copyright (c) 2017-2020 The Khronos Group Inc. ** +** SPDX-License-Identifier: Apache-2.0 +** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. ** You may obtain a copy of the License at diff --git a/include/openxr/openxr_reflection.h b/include/openxr/openxr_reflection.h index 3145775..19797be 100644 --- a/include/openxr/openxr_reflection.h +++ b/include/openxr/openxr_reflection.h @@ -4,6 +4,8 @@ /* ** Copyright (c) 2017-2020 The Khronos Group Inc. ** +** SPDX-License-Identifier: Apache-2.0 +** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. ** You may obtain a copy of the License at @@ -179,6 +181,8 @@ XR_ENUM_STR(XrResult); _(XR_TYPE_GRAPHICS_BINDING_D3D12_KHR, 1000028000) \ _(XR_TYPE_SWAPCHAIN_IMAGE_D3D12_KHR, 1000028001) \ _(XR_TYPE_GRAPHICS_REQUIREMENTS_D3D12_KHR, 1000028002) \ + _(XR_TYPE_SYSTEM_EYE_GAZE_INTERACTION_PROPERTIES_EXT, 1000030000) \ + _(XR_TYPE_EYE_GAZE_SAMPLE_TIME_EXT, 1000030001) \ _(XR_TYPE_VISIBILITY_MASK_KHR, 1000031000) \ _(XR_TYPE_EVENT_DATA_VISIBILITY_MASK_CHANGED_KHR, 1000031001) \ _(XR_TYPE_SESSION_CREATE_INFO_OVERLAY_EXTX, 1000033000) \ @@ -344,10 +348,10 @@ XR_ENUM_STR(XrResult); _(XR_DEBUG_UTILS_MESSAGE_TYPE_CONFORMANCE_BIT_EXT, 0x00000008) #define XR_LIST_BITS_XrOverlaySessionCreateFlagsEXTX(_) \ - _(XR_OVERLAY_SESSION_CREATE_RELAXED_DISPLAY_TIME_EXTX, 0x00000001) + _(XR_OVERLAY_SESSION_CREATE_RELAXED_DISPLAY_TIME_BIT_EXTX, 0x00000001) #define XR_LIST_BITS_XrOverlayMainSessionFlagsEXTX(_) \ - _(XR_MAIN_SESSION_BIT_ENABLED_COMPOSITION_LAYER_INFO_DEPTH_EXTX, 0x00000001) + _(XR_OVERLAY_MAIN_SESSION_ENABLED_COMPOSITION_LAYER_INFO_DEPTH_BIT_EXTX, 0x00000001) #define XR_LIST_STRUCT_XrApiLayerProperties(_) \ _(type) \ @@ -1012,6 +1016,16 @@ XR_ENUM_STR(XrResult); _(userCallback) \ _(userData) +#define XR_LIST_STRUCT_XrSystemEyeGazeInteractionPropertiesEXT(_) \ + _(type) \ + _(next) \ + _(supportsEyeGazeInteraction) + +#define XR_LIST_STRUCT_XrEyeGazeSampleTimeEXT(_) \ + _(type) \ + _(next) \ + _(time) + #define XR_LIST_STRUCT_XrSessionCreateInfoOverlayEXTX(_) \ _(type) \ _(next) \ diff --git a/specification/registry/xr.xml b/specification/registry/xr.xml index 4f1c5ad..f5539da 100644 --- a/specification/registry/xr.xml +++ b/specification/registry/xr.xml @@ -58,6 +58,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project. <tag name="PLUTO" author="Pluto VR" contact="Jared Cheshier @Jared, Sophia Baldonado @sophia"/> <tag name="QCOM" author="Qualcomm Technologies" contact="Armelle @alaine_qcom, Martin Renschler @martinr"/> <tag name="STARBREEZE" author="Starbreeze" contact="David Srour @dsrour"/> + <tag name="TOBII" author="Tobii" contact="Denny Rönngren @denron"/> <tag name="VALVE" author="Valve" contact="Joe Ludwig @JoeLudwig"/> <tag name="VARJO" author="Varjo" contact="Sergiy Dubovik @dubik, Rémi Arnaud @VarjoRemi"/> </tags> @@ -114,7 +115,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project. updates them automatically by processing a line at a time. --> <type category="define">// OpenXR current version number. -#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 7)</type> +#define <name>XR_CURRENT_API_VERSION</name> <type>XR_MAKE_VERSION</type>(1, 0, 8)</type> <!-- NOTE: For avoidance of ambiguity, there should only be 1 <name> tag immediately in @@ -1011,6 +1012,19 @@ maintained in the master branch of the Khronos OpenXR GitHub project. <type>void</type>* userData); </type> + <!-- types for XR_EXT_eye_gaze_interaction --> + <type category="struct" name="XrSystemEyeGazeInteractionPropertiesEXT" structextends="XrSystemProperties"> + <member values="XR_TYPE_SYSTEM_EYE_GAZE_INTERACTION_PROPERTIES_EXT"><type>XrStructureType</type> <name>type</name></member> + <member><type>void</type>* <name>next</name></member> + <member><type>XrBool32</type> <name>supportsEyeGazeInteraction</name></member> + </type> + + <type category="struct" name="XrEyeGazeSampleTimeEXT" structextends="XrSpaceLocation"> + <member values="XR_TYPE_EYE_GAZE_SAMPLE_TIME_EXT"><type>XrStructureType</type> <name>type</name></member> + <member><type>void</type>* <name>next</name></member> + <member><type>XrTime</type> <name>time</name></member> + </type> + <!-- types for XR_MSFT_spatial_anchor --> <type category="struct" name="XrSpatialAnchorCreateInfoMSFT"> <member values="XR_TYPE_SPATIAL_ANCHOR_CREATE_INFO_MSFT"><type>XrStructureType</type><name>type</name></member> @@ -1337,10 +1351,10 @@ maintained in the master branch of the Khronos OpenXR GitHub project. <enum bitpos="3" name="XR_DEBUG_UTILS_MESSAGE_TYPE_CONFORMANCE_BIT_EXT" comment="Indicates the message is related to a non-conformant runtime result"/> </enums> <enums name="XrOverlayMainSessionFlagBitsEXTX" type="bitmask"> - <enum bitpos="0" name="XR_MAIN_SESSION_BIT_ENABLED_COMPOSITION_LAYER_INFO_DEPTH_EXTX" comment="Indicates the main session enabled XR_KHR_extra_layer_info_depth"/> + <enum bitpos="0" name="XR_OVERLAY_MAIN_SESSION_ENABLED_COMPOSITION_LAYER_INFO_DEPTH_BIT_EXTX" comment="Indicates the main session enabled XR_KHR_extra_layer_info_depth"/> </enums> <enums name="XrOverlaySessionCreateFlagBitsEXTX" type="bitmask"> - <enum bitpos="0" name="XR_OVERLAY_SESSION_CREATE_RELAXED_DISPLAY_TIME_EXTX" comment="Indicates the runtime does not need to attempt to lock the overlay session displayTime to the main session displayTime"/> + <enum bitpos="0" name="XR_OVERLAY_SESSION_CREATE_RELAXED_DISPLAY_TIME_BIT_EXTX" comment="Indicates the runtime does not need to attempt to lock the overlay session displayTime to the main session displayTime"/> </enums> @@ -1630,7 +1644,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project. <param>const <type>XrActionStateGetInfo</type>* <name>getInfo</name></param> <param><type>XrActionStatePose</type>* <name>state</name></param> </command> - <command successcodes="XR_SUCCESS" errorcodes="XR_ERROR_INSTANCE_LOST,XR_ERROR_RUNTIME_FAILURE,XR_ERROR_LIMIT_REACHED,XR_ERROR_HANDLE_INVALID,XR_ERROR_OUT_OF_MEMORY,XR_ERROR_VALIDATION_FAILURE,XR_ERROR_NAME_DUPLICATED,XR_ERROR_NAME_INVALID,XR_ERROR_PATH_FORMAT_INVALID"> + <command successcodes="XR_SUCCESS" errorcodes="XR_ERROR_INSTANCE_LOST,XR_ERROR_RUNTIME_FAILURE,XR_ERROR_LIMIT_REACHED,XR_ERROR_HANDLE_INVALID,XR_ERROR_OUT_OF_MEMORY,XR_ERROR_VALIDATION_FAILURE,XR_ERROR_NAME_DUPLICATED,XR_ERROR_LOCALIZED_NAME_DUPLICATED,XR_ERROR_NAME_INVALID,XR_ERROR_LOCALIZED_NAME_INVALID,XR_ERROR_PATH_FORMAT_INVALID"> <proto><type>XrResult</type> <name>xrCreateActionSet</name></proto> <param><type>XrInstance</type> <name>instance</name></param> <param>const <type>XrActionSetCreateInfo</type>* <name>createInfo</name></param> @@ -1640,7 +1654,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project. <proto><type>XrResult</type> <name>xrDestroyActionSet</name></proto> <param externsync="true_with_children"><type>XrActionSet</type> <name>actionSet</name></param> </command> - <command successcodes="XR_SUCCESS" errorcodes="XR_ERROR_INSTANCE_LOST,XR_ERROR_RUNTIME_FAILURE,XR_ERROR_ACTIONSETS_ALREADY_ATTACHED,XR_ERROR_LIMIT_REACHED,XR_ERROR_HANDLE_INVALID,XR_ERROR_OUT_OF_MEMORY,XR_ERROR_PATH_INVALID,XR_ERROR_VALIDATION_FAILURE,XR_ERROR_NAME_DUPLICATED,XR_ERROR_NAME_INVALID,XR_ERROR_PATH_FORMAT_INVALID,XR_ERROR_PATH_UNSUPPORTED"> + <command successcodes="XR_SUCCESS" errorcodes="XR_ERROR_INSTANCE_LOST,XR_ERROR_RUNTIME_FAILURE,XR_ERROR_ACTIONSETS_ALREADY_ATTACHED,XR_ERROR_LIMIT_REACHED,XR_ERROR_HANDLE_INVALID,XR_ERROR_OUT_OF_MEMORY,XR_ERROR_PATH_INVALID,XR_ERROR_VALIDATION_FAILURE,XR_ERROR_NAME_DUPLICATED,XR_ERROR_LOCALIZED_NAME_DUPLICATED,XR_ERROR_NAME_INVALID,XR_ERROR_LOCALIZED_NAME_INVALID,XR_ERROR_PATH_FORMAT_INVALID,XR_ERROR_PATH_UNSUPPORTED"> <proto><type>XrResult</type> <name>xrCreateAction</name></proto> <param><type>XrActionSet</type> <name>actionSet</name></param> <param>const <type>XrActionCreateInfo</type>* <name>createInfo</name></param> @@ -1679,7 +1693,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project. <param><type>uint32_t</type>* <name>sourceCountOutput</name></param> <param optional="true" len="sourceCapacityInput"><type>XrPath</type>* <name>sources</name></param> </command> - <command successcodes="XR_SUCCESS,XR_SESSION_LOSS_PENDING" errorcodes="XR_ERROR_INSTANCE_LOST,XR_ERROR_SESSION_LOST,XR_ERROR_RUNTIME_FAILURE,XR_ERROR_HANDLE_INVALID,XR_ERROR_VALIDATION_FAILURE,XR_ERROR_SIZE_INSUFFICIENT,XR_ERROR_PATH_INVALID,XR_ERROR_PATH_UNSUPPORTED"> + <command successcodes="XR_SUCCESS,XR_SESSION_LOSS_PENDING" errorcodes="XR_ERROR_INSTANCE_LOST,XR_ERROR_SESSION_LOST,XR_ERROR_RUNTIME_FAILURE,XR_ERROR_HANDLE_INVALID,XR_ERROR_VALIDATION_FAILURE,XR_ERROR_SIZE_INSUFFICIENT,XR_ERROR_PATH_INVALID,XR_ERROR_PATH_UNSUPPORTED,XR_ERROR_ACTIONSET_NOT_ATTACHED"> <proto><type>XrResult</type> <name>xrGetInputSourceLocalizedName</name></proto> <param><type>XrSession</type> <name>session</name></param> <param>const <type>XrInputSourceLocalizedNameGetInfo</type>* <name>getInfo</name></param> @@ -2321,12 +2335,16 @@ maintained in the master branch of the Khronos OpenXR GitHub project. </require> </extension> - <!-- Reserved space for Eye tracking extension --> - <extension name="XR_EXT_eye_tracking" number="31" type="instance" supported="disabled"> - <require> - <enum value="1" name="XR_EXT_eye_tracking_SPEC_VERSION"/> - <enum value=""XR_EXT_eye_tracking"" name="XR_EXT_EYE_TRACKING_EXTENSION_NAME"/> - </require> + <!-- Eye gaze interaction extension --> + <extension name="XR_EXT_eye_gaze_interaction" number="31" type="instance" supported="openxr"> + <require> + <enum value="1" name="XR_EXT_eye_gaze_interaction_SPEC_VERSION"/> + <enum value=""XR_EXT_eye_gaze_interaction"" name="XR_EXT_EYE_GAZE_INTERACTION_EXTENSION_NAME"/> + <enum offset="0" extends="XrStructureType" name="XR_TYPE_SYSTEM_EYE_GAZE_INTERACTION_PROPERTIES_EXT"/> + <enum offset="1" extends="XrStructureType" name="XR_TYPE_EYE_GAZE_SAMPLE_TIME_EXT"/> + <type name="XrSystemEyeGazeInteractionPropertiesEXT" /> + <type name="XrEyeGazeSampleTimeEXT" /> + </require> </extension> <!-- Visibility mask extension --> @@ -2354,7 +2372,7 @@ maintained in the master branch of the Khronos OpenXR GitHub project. <!-- Overlay preview extension --> <extension name="XR_EXTX_overlay" number="34" type="instance" provisional="true" supported="openxr"> <require> - <enum value="3" name="XR_EXTX_overlay_SPEC_VERSION"/> + <enum value="4" name="XR_EXTX_overlay_SPEC_VERSION"/> <enum value=""XR_EXTX_overlay"" name="XR_EXTX_OVERLAY_EXTENSION_NAME"/> <enum offset="0" extends="XrStructureType" name="XR_TYPE_SESSION_CREATE_INFO_OVERLAY_EXTX"/> <enum offset="3" extends="XrStructureType" name="XR_TYPE_EVENT_DATA_MAIN_SESSION_VISIBILITY_CHANGED_EXTX"/> diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index ed0e78b..b7c18cb 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (c) 2017 The Khronos Group Inc. # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/cmake/FindJsonCpp.cmake b/src/cmake/FindJsonCpp.cmake index c3583f6..9cd8684 100644 --- a/src/cmake/FindJsonCpp.cmake +++ b/src/cmake/FindJsonCpp.cmake @@ -28,6 +28,9 @@ # # Copyright Philippe Crassous 2011. # Copyright Sensics, Inc. 2016. +# +# SPDX-License-Identifier: BSL-1.0 +# # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) diff --git a/src/cmake/FindVulkanHeaders.cmake b/src/cmake/FindVulkanHeaders.cmake index 9fc5dab..85f5bcd 100644 --- a/src/cmake/FindVulkanHeaders.cmake +++ b/src/cmake/FindVulkanHeaders.cmake @@ -2,6 +2,8 @@ # Copyright (c) 2018-2019 Valve Corporation # Copyright (c) 2018-2019 LunarG, Inc. # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/common/extra_algorithms.h b/src/common/extra_algorithms.h index c57c81c..bd603d7 100644 --- a/src/common/extra_algorithms.h +++ b/src/common/extra_algorithms.h @@ -3,6 +3,8 @@ // Copyright (c) 2017-2019 LunarG, Inc. // Copyright (c) 2019 Collabora, Ltd. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/filesystem_utils.cpp b/src/common/filesystem_utils.cpp index 34c5fc8..b6fe8f3 100644 --- a/src/common/filesystem_utils.cpp +++ b/src/common/filesystem_utils.cpp @@ -2,6 +2,8 @@ // Copyright (c) 2017 Valve Corporation // Copyright (c) 2017 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/filesystem_utils.hpp b/src/common/filesystem_utils.hpp index 4c68a7c..d26c321 100644 --- a/src/common/filesystem_utils.hpp +++ b/src/common/filesystem_utils.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017 Valve Corporation // Copyright (c) 2017 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/hex_and_handles.h b/src/common/hex_and_handles.h index 42e6625..01276f7 100644 --- a/src/common/hex_and_handles.h +++ b/src/common/hex_and_handles.h @@ -3,6 +3,8 @@ // Copyright (c) 2017-2019 LunarG, Inc. // Copyright (c) 2019 Collabora, Ltd. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/loader_interfaces.h b/src/common/loader_interfaces.h index af1102b..1a153a9 100644 --- a/src/common/loader_interfaces.h +++ b/src/common/loader_interfaces.h @@ -2,6 +2,8 @@ // Copyright (c) 2017 Valve Corporation // Copyright (c) 2017 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/object_info.cpp b/src/common/object_info.cpp index bcbd151..3013dcd 100644 --- a/src/common/object_info.cpp +++ b/src/common/object_info.cpp @@ -3,6 +3,8 @@ // Copyright (c) 2017-2019 LunarG, Inc. // Copyright (c) 2019 Collabora, Ltd. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/object_info.h b/src/common/object_info.h index ec05edc..6809dc0 100644 --- a/src/common/object_info.h +++ b/src/common/object_info.h @@ -3,6 +3,8 @@ // Copyright (c) 2017-2019 LunarG, Inc. // Copyright (c) 2019 Collabora, Ltd. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/platform_utils.hpp b/src/common/platform_utils.hpp index c4e44d2..43cf575 100644 --- a/src/common/platform_utils.hpp +++ b/src/common/platform_utils.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/xr_dependencies.h b/src/common/xr_dependencies.h index 6b43aab..33507fd 100644 --- a/src/common/xr_dependencies.h +++ b/src/common/xr_dependencies.h @@ -1,5 +1,7 @@ // Copyright (c) 2018-2020 The Khronos Group Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common/xr_linear.h b/src/common/xr_linear.h index 433f8d9..7b7dfff 100644 --- a/src/common/xr_linear.h +++ b/src/common/xr_linear.h @@ -1,6 +1,8 @@ // Copyright (c) 2017 The Khronos Group Inc. // Copyright (c) 2016 Oculus VR, LLC. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/common_config.h.in b/src/common_config.h.in index 9333caf..813c097 100644 --- a/src/common_config.h.in +++ b/src/common_config.h.in @@ -2,6 +2,8 @@ // Copyright (c) 2017 Valve Corporation // Copyright (c) 2017 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/CMakeLists.txt b/src/loader/CMakeLists.txt index 4789c78..ca395af 100644 --- a/src/loader/CMakeLists.txt +++ b/src/loader/CMakeLists.txt @@ -1,5 +1,7 @@ # Copyright (c) 2017 The Khronos Group Inc. # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at @@ -201,11 +203,11 @@ elseif(WIN32) add_custom_command( TARGET openxr_loader POST_BUILD COMMAND xcopy /Y /I ${COPY_DLL_SRC_PATH} ${COPY_DST_HELLO_XR_PATH} - COMMAND xcopy /Y /I ${COPY_PDB_SRC_PATH} ${COPY_DST_HELLO_XR_PATH} + COMMAND if exist ${COPY_PDB_SRC_PATH} xcopy /Y /I ${COPY_PDB_SRC_PATH} ${COPY_DST_HELLO_XR_PATH} COMMAND xcopy /Y /I ${COPY_DLL_SRC_PATH} ${COPY_DST_LOADER_TEST_PATH} - COMMAND xcopy /Y /I ${COPY_PDB_SRC_PATH} ${COPY_DST_LOADER_TEST_PATH} + COMMAND if exist ${COPY_PDB_SRC_PATH} xcopy /Y /I ${COPY_PDB_SRC_PATH} ${COPY_DST_LOADER_TEST_PATH} COMMAND xcopy /Y /I ${COPY_DLL_SRC_PATH} ${COPY_DST_CONFORMANCE_TEST_PATH} - COMMAND xcopy /Y /I ${COPY_PDB_SRC_PATH} ${COPY_DST_CONFORMANCE_TEST_PATH} + COMMAND if exist ${COPY_PDB_SRC_PATH} xcopy /Y /I ${COPY_PDB_SRC_PATH} ${COPY_DST_CONFORMANCE_TEST_PATH} ) endif() endif() diff --git a/src/loader/api_layer_interface.cpp b/src/loader/api_layer_interface.cpp index 46b427d..d650b9b 100644 --- a/src/loader/api_layer_interface.cpp +++ b/src/loader/api_layer_interface.cpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/api_layer_interface.hpp b/src/loader/api_layer_interface.hpp index b9f97df..c639d72 100644 --- a/src/loader/api_layer_interface.hpp +++ b/src/loader/api_layer_interface.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/exception_handling.hpp b/src/loader/exception_handling.hpp index 29945fe..9a04265 100644 --- a/src/loader/exception_handling.hpp +++ b/src/loader/exception_handling.hpp @@ -1,5 +1,7 @@ // Copyright (c) 2019-2020 The Khronos Group Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_core.cpp b/src/loader/loader_core.cpp index 2ff6b3e..829f530 100644 --- a/src/loader/loader_core.cpp +++ b/src/loader/loader_core.cpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_instance.cpp b/src/loader/loader_instance.cpp index b443790..b83f752 100644 --- a/src/loader/loader_instance.cpp +++ b/src/loader/loader_instance.cpp @@ -3,6 +3,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_instance.hpp b/src/loader/loader_instance.hpp index 9586645..b8804f6 100644 --- a/src/loader/loader_instance.hpp +++ b/src/loader/loader_instance.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_logger.cpp b/src/loader/loader_logger.cpp index 771874e..faf79b2 100644 --- a/src/loader/loader_logger.cpp +++ b/src/loader/loader_logger.cpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_logger.hpp b/src/loader/loader_logger.hpp index 6fcfe56..1ff8f31 100644 --- a/src/loader/loader_logger.hpp +++ b/src/loader/loader_logger.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_logger_recorders.cpp b/src/loader/loader_logger_recorders.cpp index 9963076..d2d4786 100644 --- a/src/loader/loader_logger_recorders.cpp +++ b/src/loader/loader_logger_recorders.cpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_logger_recorders.hpp b/src/loader/loader_logger_recorders.hpp index 282236e..1e89e5f 100644 --- a/src/loader/loader_logger_recorders.hpp +++ b/src/loader/loader_logger_recorders.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/loader_platform.hpp b/src/loader/loader_platform.hpp index 292c73a..c371474 100644 --- a/src/loader/loader_platform.hpp +++ b/src/loader/loader_platform.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/manifest_file.cpp b/src/loader/manifest_file.cpp index 68fd1d4..29a860d 100644 --- a/src/loader/manifest_file.cpp +++ b/src/loader/manifest_file.cpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/manifest_file.hpp b/src/loader/manifest_file.hpp index e2cc6f2..df5a3ff 100644 --- a/src/loader/manifest_file.hpp +++ b/src/loader/manifest_file.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017 Valve Corporation // Copyright (c) 2017 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/openxr-loader.def b/src/loader/openxr-loader.def index b97d1d8..5534b25 100644 --- a/src/loader/openxr-loader.def +++ b/src/loader/openxr-loader.def @@ -3,6 +3,8 @@ ; ; Copyright (c) 2019-2020 The Khronos Group Inc. ; +; SPDX-License-Identifier: Apache-2.0 +; ; Licensed under the Apache License, Version 2.0 (the "License"); ; you may not use this file except in compliance with the License. ; You may obtain a copy of the License at diff --git a/src/loader/runtime_interface.cpp b/src/loader/runtime_interface.cpp index 59a3efd..fcda389 100644 --- a/src/loader/runtime_interface.cpp +++ b/src/loader/runtime_interface.cpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/runtime_interface.hpp b/src/loader/runtime_interface.hpp index 4358e05..d6f844d 100644 --- a/src/loader/runtime_interface.hpp +++ b/src/loader/runtime_interface.hpp @@ -2,6 +2,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/xr_generated_loader.cpp b/src/loader/xr_generated_loader.cpp index 346d71c..1560d8a 100644 --- a/src/loader/xr_generated_loader.cpp +++ b/src/loader/xr_generated_loader.cpp @@ -6,6 +6,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/loader/xr_generated_loader.hpp b/src/loader/xr_generated_loader.hpp index 05f48b7..ac1d6ec 100644 --- a/src/loader/xr_generated_loader.hpp +++ b/src/loader/xr_generated_loader.hpp @@ -6,6 +6,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/version.cmake b/src/version.cmake index b7ab1db..0240f2b 100644 --- a/src/version.cmake +++ b/src/version.cmake @@ -1,5 +1,7 @@ # Copyright (c) 2017-2020 The Khronos Group Inc. # +# SPDX-License-Identifier: Apache-2.0 +# # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at diff --git a/src/xr_generated_dispatch_table.c b/src/xr_generated_dispatch_table.c index 5c4d169..f14680c 100644 --- a/src/xr_generated_dispatch_table.c +++ b/src/xr_generated_dispatch_table.c @@ -6,6 +6,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at diff --git a/src/xr_generated_dispatch_table.h b/src/xr_generated_dispatch_table.h index 52a5348..bc672af 100644 --- a/src/xr_generated_dispatch_table.h +++ b/src/xr_generated_dispatch_table.h @@ -6,6 +6,8 @@ // Copyright (c) 2017-2019 Valve Corporation // Copyright (c) 2017-2019 LunarG, Inc. // +// SPDX-License-Identifier: Apache-2.0 +// // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. // You may obtain a copy of the License at |