Merge branch 'KhronosGroup:main' into dengkail/apilayer_discovery

Author: quic-dengkail

.appveyor.yml

@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-version: 1.0.29.{build}
+version: 1.0.30.{build}
 image: Visual Studio 2017
 
 

.reuse/dep5

@@ -1,7 +1,7 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: OpenXR
 Upstream-Contact: Ryan Pavlik <openxr-speceditor AT khronos DOT org>
-Source: https://khronos.org/registry/OpenXR/
+Source: https://registry.khronos.org/OpenXR/
 
 Files: changes/conformance/*
        changes/registry/*
@@ -54,8 +54,8 @@ Comment: Unmodified, vendored copy of a subset of the tiny-gltf repo v2.8.9
 Files: src/external/d3dx12/*
 Copyright: Copyright (c) Microsoft Corporation.
 License: MIT
-Comment: Unmodified, vendored copy of DirectX-Headers commit da7aedb
-  of https://github.com/microsoft/DirectX-Headers filtered to just d3dx12 headers
+Comment: Unmodified, vendored copy of d3dx12.h from directx-vs-templates commit 86b9c45
+  This repo includes ifdefs to improve compatibility with older Windows SDK verions.
 
 Files: src/external/mikktspace/*
 Copyright: 2011 by Morten S. Mikkelsen

CHANGELOG.SDK.md

@@ -19,6 +19,45 @@ 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.30 (2023-09-20)
+
+This release is primarily a quality improvement release, fixing a range of
+issues in the registry and SDK, including fixing a loader bug related to layers,
+in addition to a new vendor extension and an updated vendor extension.
+
+- Registry
+  - Add missing enum tags for enum-sized array struct members.
+    ([internal MR 2731](https://gitlab.khronos.org/openxr/openxr/merge_requests/2731))
+  - Fix EGL "get proc addr" function pointer typedef.
+    ([internal MR 2939](https://gitlab.khronos.org/openxr/openxr/merge_requests/2939))
+  - New vendor extension: `XR_YVR_controller_interaction`
+    ([internal MR 2841](https://gitlab.khronos.org/openxr/openxr/merge_requests/2841))
+  - `XR_BD_controller_interaction`: Add support for G3 devices
+    ([internal MR 2872](https://gitlab.khronos.org/openxr/openxr/merge_requests/2872))
+  - Fix specification errors highlighted by fixed tooling.
+    ([internal MR 2923](https://gitlab.khronos.org/openxr/openxr/merge_requests/2923))
+- SDK
+  - Add installable manual page for `openxr_runtime_list_json`.
+    ([internal MR 2899](https://gitlab.khronos.org/openxr/openxr/merge_requests/2899))
+  - Remove unused diagram exports from loader directory.
+    ([internal MR 2907](https://gitlab.khronos.org/openxr/openxr/merge_requests/2907))
+  - Update URLs in manual pages.
+    ([internal MR 2935](https://gitlab.khronos.org/openxr/openxr/merge_requests/2935))
+  - Validation Layer: Remove conditional `XR_KHR_headless` support as the extension
+    is not part of OpenXR 1.0.
+    ([internal MR 2901](https://gitlab.khronos.org/openxr/openxr/merge_requests/2901))
+  - build system: Add CTest support for running the loader test.
+    ([internal MR 2289](https://gitlab.khronos.org/openxr/openxr/merge_requests/2289),
+    [OpenXR-SDK-Source issue 309](https://github.com/KhronosGroup/OpenXR-SDK-Source/issues/309),
+    [internal issue 1733](https://gitlab.khronos.org/openxr/openxr/issues/1733))
+  - hello_xr: Clean up how we specify the default graphics plugin on Android.
+    ([internal MR 2917](https://gitlab.khronos.org/openxr/openxr/merge_requests/2917))
+  - list_json: Add missing return statement for exit code.
+    ([internal MR 2936](https://gitlab.khronos.org/openxr/openxr/merge_requests/2936))
+  - loader: fix for implicit/explicit api layer loading logic
+    ([OpenXR-SDK-Source PR 421](https://github.com/KhronosGroup/OpenXR-SDK-Source/pull/421),
+    [internal issue 2079](https://gitlab.khronos.org/openxr/openxr/issues/2079))
+
 ## OpenXR SDK 1.0.29 (2023-08-25)
 
 This release contains several fixes to the specification registry, improvements

CMakeLists.txt

@@ -25,6 +25,7 @@ cmake_minimum_required(VERSION 3.0)
 project(OPENXR)
 
 find_package(PythonInterp 3)
+include(CTest)
 
 # Enable IDE GUI folders.  "Helper targets" that don't have interesting source code should set their FOLDER property to this
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)

maintainer-scripts/common.sh

@@ -187,6 +187,7 @@ getSDKSourceFilenames() {
         maintainer-scripts/build-and-publish-aar-snapshot.sh \
         maintainer-scripts/publish-aar \
         specification/.gitignore \
+        specification/config/attribs.adoc \
         specification/registry/*.xml \
         specification/scripts \
         specification/loader \

specification/Makefile

@@ -32,7 +32,7 @@ ifneq (,$(strip $(VERY_STRICT)))
 ASCIIDOC := $(ASCIIDOC) --failure-level WARN
 endif
 
-SPECREVISION = 1.0.29
+SPECREVISION = 1.0.30
 REVISION_COMPONENTS = $(subst ., ,$(SPECREVISION))
 MAJORMINORVER = $(word 1,$(REVISION_COMPONENTS)).$(word 2,$(REVISION_COMPONENTS))
 
@@ -57,7 +57,7 @@ PYAPIMAP      := $(GENDIR)/apimap.py
 RBAPIMAP      := $(GENDIR)/apimap.rb
 METADIR       := $(GENDIR)/meta
 
-VK_REF_PAGE_ROOT := https://www.khronos.org/registry/vulkan/specs/1.3-extensions/man/html
+VK_REF_PAGE_ROOT := https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/
 
 MAKE_RELATIVE = $(patsubst $(CURDIR)/%,%,$(1))
 
@@ -406,7 +406,7 @@ MANSOURCES   = $(CORESOURCES) $(VENSOURCES) $(KHRSOURCES)
 MANGENERATED = $(wildcard $(REFPATH)/*)
 MANHTML      = $(MANSOURCES:$(REFPATH)/%.txt=$(MANHTMLDIR)/%.html)
 MANDEPS      = $(GENINCLUDE) $(GENDEPENDS)
-HTML_SPEC_RELATIVE ?= ../../$(SPEC_FILENAME_STEM).html
+HTML_SPEC_RELATIVE ?= ../../html/$(SPEC_FILENAME_STEM).html
 
 # Asciidoctor options to build refpages
 #
@@ -421,8 +421,7 @@ ADOCREFOPTS  = -a stylesheet=khronos.css \
                -a refprefix='refpage.' \
                -a isrefpage \
                -a html_spec_relative='$(HTML_SPEC_RELATIVE)' \
-               -a imagesdir=$(CURDIR)/sources \
-               -a vkRefPageRoot='$(VK_REF_PAGE_ROOT)'
+               -a imagesdir=$(CURDIR)/sources
 
 # Pure makefile lowercase function, generated by a script.
 make_lower = $(subst A,a,$(subst B,b,$(subst C,c,$(subst D,d,$(subst E,e,$(subst F,f,$(subst G,g,$(subst H,h,$(subst I,i,$(subst J,j,$(subst K,k,$(subst L,l,$(subst M,m,$(subst N,n,$(subst O,o,$(subst P,p,$(subst Q,q,$(subst R,r,$(subst S,s,$(subst T,t,$(subst U,u,$(subst V,v,$(subst W,w,$(subst X,x,$(subst Y,y,$(subst Z,z,$(1)))))))))))))))))))))))))))

specification/config/attribs.adoc

@@ -0,0 +1,101 @@
+// Copyright (c) 2015-2023, The Khronos Group Inc.
+//
+// SPDX-License-Identifier: CC-BY-4.0
+
+// Various special / math symbols, matching LaTeX names.
+// The pass:[+ ] notation avoids asciidoctor EOL treatment of the attribute.
+
+// Special symbols - not used in [eq] spans
+:sym1: ✓
+:sym2: †
+:reg: ®
+:trade: ™
+
+// Math operators and logic symbols
+:times: ×
+:cdot: ⋅
+:plus: pass:[+ ]
+:geq: ≥
+:leq: ≤
+:neq: ≠
+:leftarrow: ←
+:uparrow: ↑
+:rightarrow: →
+:downarrow: ↓
+:elem: ∈
+:lnot: ¬
+:land: ∧
+:lor: ∨
+:oplus: ⊕
+:lceil: ⌈
+:rceil: ⌉
+:lfloor: ⌊
+:rfloor: ⌋
+:vert: |
+:partial: ∂
+:onehalf: ½
+:onequarter: ¼
+:threequarters: ¾
+:ldots: …
+:forall: ∀
+:sqrt: √
+:inf: ∞
+:plusmn: ±
+
+// Greek letters
+:alpha: α
+:beta: β
+:gamma: γ
+:DeltaUpper: Δ
+:delta: δ
+:epsilon: ε
+:eta: η
+:theta: θ
+:lambda: λ
+:pi: π
+:rho: ρ
+:sigma: σ
+:tau: τ
+:phi: ϕ
+
+// Word break opportunity tag for HTML
+ifdef::backend-html5[]
+:wbro: pass:[<wbr>]
+endif::backend-html5[]
+ifndef::backend-html5[]
+:wbro:
+endif::backend-html5[]
+
+// Placeholders for synchronization block text
+:externsynctitle: Thread Safety
+:externsyncprefix: Access to
+
+// next chain link to avoid broken links in ref pages
+// This section is not in a ref page so cross-file-links is not the right attribute to check.
+ifdef::doctype-manpage[]
+:uri-next-chain: {html_spec_relative}#valid-usage-for-structure-pointer-chains
+endif::doctype-manpage[]
+ifndef::doctype-manpage[]
+:uri-next-chain: #valid-usage-for-structure-pointer-chains
+endif::doctype-manpage[]
+
+// URIs used in the spec:
+// If it's in the main spec and extracted to the ref pages, put it here.
+
+// OpenXR URIs
+:uri-openxr-registry-root: https://registry.khronos.org/OpenXR
+:uri-openxr-ratified-spec: {uri-openxr-registry-root}/specs/1.0-khr/html/xrspec.html
+:uri-github-openxr-docs: https://github.com/KhronosGroup/OpenXR-Docs
+
+// glTF URIs
+:uri-gltf2: https://registry.khronos.org/glTF/specs/2.0/glTF-2.0.html
+:uri-gltf2-basisu: https://github.com/KhronosGroup/glTF/tree/main/extensions/2.0/Khronos/KHR_texture_basisu
+
+// Vulkan URIs
+:uri-vk-ref-page-root: https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html
+:uri-vkCreateInstance: {uri-vk-ref-page-root}/vkCreateInstance.html
+:uri-VkInstanceCreateInfo: {uri-vk-ref-page-root}/VkInstanceCreateInfo.html
+:uri-VkAllocationCallbacks: {uri-vk-ref-page-root}/VkAllocationCallbacks.html
+:uri-vkCreateDevice: {uri-vk-ref-page-root}/vkCreateDevice.html
+:uri-VkDeviceCreateInfo: {uri-vk-ref-page-root}/VkDeviceCreateInfo.html
+:uri-VkAllocationCallbacks: {uri-vk-ref-page-root}/VkAllocationCallbacks.html