Merge branch 'main' into disable-USE_MIRROR_WINDOW-default

KhronosGroup · Jan 29, 2025 · 56e95ea · 56e95ea
2 parents 11b0a24 + 88095bc
commit 56e95ea
Show file tree

Hide file tree

Showing 1,123 changed files with 266,798 additions and 20,116 deletions.
diff --git a/.appveyor.yml b/.appveyor.yml
@@ -1,8 +1,8 @@
-# Copyright (c) 2017-2023 The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 
-version: 1.0.27.{build}
+version: 1.1.43.{build}
 image: Visual Studio 2017
 
 
@@ -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
diff --git a/.azure-pipelines/nuget/NugetTemplate/OpenXR.Loader.nuspec b/.azure-pipelines/nuget/NugetTemplate/OpenXR.Loader.nuspec
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <!--
-  Copyright (c) 2020-2023, The Khronos Group Inc.
+  Copyright (c) 2020-2024, The Khronos Group Inc.
   SPDX-License-Identifier: CC-BY-4.0
   -->
   <metadata>

diff --git a/.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.props b/.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.props
@@ -1,6 +1,6 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!--
-  Copyright (c) 2020 The Khronos Group Inc.
+  Copyright (c) 2020-2024, The Khronos Group Inc.
   SPDX-License-Identifier: CC-BY-4.0
   -->
   <PropertyGroup>

diff --git a/.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.targets b/.azure-pipelines/nuget/NugetTemplate/build/native/OpenXR.Loader.targets
@@ -1,7 +1,7 @@
 <Project ToolsVersion="4.0"
     xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
     <!--
-    Copyright (c) 2020 The Khronos Group Inc.
+    Copyright (c) 2020-2024, The Khronos Group Inc.
     SPDX-License-Identifier: CC-BY-4.0
     -->
 

diff --git a/.azure-pipelines/nuget/stage_nuget.ps1 b/.azure-pipelines/nuget/stage_nuget.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2020 The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 param(
     [Parameter(Mandatory = $true, HelpMessage = "Path to unzipped openxr_loader_windows OpenXR-SDK release asset")]

diff --git a/.azure-pipelines/openxr-sdk-source.yml b/.azure-pipelines/openxr-sdk-source.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 # Main azure-pipelines configuration for the OpenXR-SDK-Sources repo.
@@ -21,22 +21,20 @@ stages:
       - job: loader_docs
         pool:
           vmImage: "ubuntu-latest"
-        container: khronosgroup/docker-images:openxr.20230323
-        # container: khronosgroup/docker-images@sha256:091f1d988744f0b5149126d1f4bdba342b72c01dc90c2d06d4a61738bec5521c
+        container: khronosgroup/docker-images:openxr.20240924@sha256:3d595e68d21b2bba12cb7bbfa8cb135f66a2d9b97efeda6de3c6c8412163c4b7
         steps:
           - script: make loader
             workingDirectory: specification
             displayName: Build loader document
-          - publish: $(System.DefaultWorkingDirectory)/specification/generated/out/1.0/loader.html
+          - publish: $(System.DefaultWorkingDirectory)/specification/generated/out/1.1/loader.html
             artifact: LoaderDoc
 
   - stage: Generate
     jobs:
       - job: archive
         pool:
           vmImage: "ubuntu-latest"
-        container: khronosgroup/docker-images:openxr.20230323
-        # container: khronosgroup/docker-images@sha256:091f1d988744f0b5149126d1f4bdba342b72c01dc90c2d06d4a61738bec5521c
+        container: khronosgroup/docker-images:openxr.20240924@sha256:3d595e68d21b2bba12cb7bbfa8cb135f66a2d9b97efeda6de3c6c8412163c4b7
         steps:
           - script: make loader
             workingDirectory: specification
@@ -64,7 +62,7 @@ stages:
               presentationBackend: wayland
         pool:
           vmImage: "ubuntu-latest"
-        container: khronosgroup/docker-images:openxr-pregenerated-sdk.20230323
+        container: khronosgroup/docker-images:openxr-pregenerated-sdk.20240924@sha256:5ddce09400cc7e17a81e65a0e7e2c26376f21e0844a6cf932270c2955213eef6
         # container: sha256:845e19e59f22c29fedc33dcaa4f3c5f8aa44e367283ef955c7549239cf9a46d2
         steps:
           - task: DownloadPipelineArtifact@2

diff --git a/.azure-pipelines/openxr-sdk.yml b/.azure-pipelines/openxr-sdk.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 # Main azure-pipelines configuration for the OpenXR-SDK repo.

diff --git a/.azure-pipelines/shared/build_jobs.yml b/.azure-pipelines/shared/build_jobs.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 parameters:
@@ -26,8 +26,8 @@ jobs:
           presentationBackend: wayland
     pool:
       vmImage: "ubuntu-latest"
-    container: khronosgroup/docker-images:openxr-sdk.20230323
-    # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
+    container: khronosgroup/docker-images:openxr-sdk.20240924@sha256:5e6a6f5d72dc4a20d5c33f12550fdd9b6a1206e94d6cf1382e0697a5726c424c
+
     steps:
       # First build as debug
       - template: build_linux.yml

diff --git a/.azure-pipelines/shared/build_linux.yml b/.azure-pipelines/shared/build_linux.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 parameters:
@@ -10,21 +10,19 @@ parameters:
     default: ""
   - name: sourceDir
     type: string
-    default: "$(System.DefaultWorkingDirectory)"
+    default: "$(Pipeline.Workspace)"
   - name: buildDir
     type: string
-    default: build
+    default: "$(Build.BinariesDirectory)"
 
 steps:
-  - script: |
-      rm -rf ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
-      mkdir -p ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
-    displayName: "Clean up and create new build directory"
+  - script: "rm -rf ${{ parameters.buildDir }}"
+    displayName: "Clean up build directory"
 
-  - script: cmake -G Ninja .. -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}
-    workingDirectory: ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
+  - script: "cmake -G Ninja -S . -B ${{ parameters.buildDir }} -DCMAKE_BUILD_TYPE=${{ parameters.buildType }} ${{ parameters.cmakeArgs }}"
+    workingDirectory: "${{ parameters.sourceDir }}"
     displayName: "Generate build system"
 
-  - script: ninja
-    workingDirectory: ${{ parameters.sourceDir }}/${{ parameters.buildDir }}
+  - script: "ninja -C ${{ parameters.buildDir }}"
+    workingDirectory: "${{ parameters.sourceDir }}"
     displayName: "Compile"
diff --git a/.azure-pipelines/shared/build_mingw.yml b/.azure-pipelines/shared/build_mingw.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 parameters:
@@ -17,6 +17,9 @@ parameters:
     default: "true"
 
 steps:
+  - checkout: self
+    lfs: true
+
   # - script: choco install -y ninja
   #   displayName: 'Install Ninja'
 

diff --git a/.azure-pipelines/shared/build_msvc.yml b/.azure-pipelines/shared/build_msvc.yml
@@ -1,4 +1,4 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 parameters:
@@ -20,6 +20,9 @@ parameters:
     default: "true"
 
 steps:
+  - checkout: self
+    lfs: true
+
   - powershell: ./.azure-pipelines/shared/install_vulkan.ps1
     displayName: Install Vulkan SDK
     workingDirectory: "${{ parameters.sourceDir }}"

diff --git a/.azure-pipelines/shared/check_clang_format.yml b/.azure-pipelines/shared/check_clang_format.yml
@@ -1,14 +1,17 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 jobs:
   - job: check_clang_format
     displayName: "clang-format"
     pool:
       vmImage: "ubuntu-latest"
-    container: khronosgroup/docker-images:openxr-sdk.20230323
-    # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
+    container: khronosgroup/docker-images:openxr.20240924@sha256:3d595e68d21b2bba12cb7bbfa8cb135f66a2d9b97efeda6de3c6c8412163c4b7
+
     steps:
+      - checkout: self
+        lfs: true
+
       - script: ./runClangFormat.sh
         displayName: Run clang-format
 

diff --git a/.azure-pipelines/shared/check_file_format.yml b/.azure-pipelines/shared/check_file_format.yml
@@ -1,23 +1,23 @@
-# Copyright (c) 2020-2023, The Khronos Group Inc.
+# Copyright (c) 2020-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 jobs:
-- job: check_file_format
-  displayName: 'Check file formatting'
-  pool:
-    vmImage: 'ubuntu-latest'
-  container: khronosgroup/docker-images:openxr-sdk.20230323
-  # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
-  steps:
-    - script: ./file_format.sh
-      displayName: File formatting checks (file_format.sh)
+  - job: check_file_format
+    displayName: "Check file formatting"
+    pool:
+      vmImage: "ubuntu-latest"
+    container: khronosgroup/docker-images:openxr-sdk.20240924@sha256:5e6a6f5d72dc4a20d5c33f12550fdd9b6a1206e94d6cf1382e0697a5726c424c
 
-    - script: git diff --patch --exit-code > file_format.patch
-      displayName: Save changes as diff
-    - script: echo "The following files need file formatting:"; sed -n -e "s/^diff.* b\///p" file_format.patch
-      condition: failed()
-    - task: PublishPipelineArtifact@1
-      displayName: Publish diff
-      condition: failed()
-      inputs:
-        path: $(System.DefaultWorkingDirectory)/file_format.patch
-        artifact: file_format_changes
+    steps:
+      - script: ./file_format.sh
+        displayName: File formatting checks (file_format.sh)
+
+      - script: git diff --patch --exit-code > file_format.patch
+        displayName: Save changes as diff
+      - script: echo "The following files need file formatting:"; sed -n -e "s/^diff.* b\///p" file_format.patch
+        condition: failed()
+      - task: PublishPipelineArtifact@1
+        displayName: Publish diff
+        condition: failed()
+        inputs:
+          path: $(System.DefaultWorkingDirectory)/file_format.patch
+          artifact: file_format_changes
diff --git a/.azure-pipelines/shared/codespell.yml b/.azure-pipelines/shared/codespell.yml
@@ -1,13 +1,16 @@
-# Copyright (c) 2019-2023, The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 jobs:
   - job: check_codespell
     displayName: "codespell"
     pool:
       vmImage: "ubuntu-latest"
-    container: khronosgroup/docker-images:openxr-sdk.20230323
-    # container: khronosgroup/docker-images@sha256:20edadbaa6cdec4fed7417c24b18dfb4b93eec940fdf1a27b5f97272dec47032
+    container: khronosgroup/docker-images:openxr-sdk.20240924@sha256:5e6a6f5d72dc4a20d5c33f12550fdd9b6a1206e94d6cf1382e0697a5726c424c
+
     steps:
+      - checkout: self
+        lfs: true
+
       - script: ./checkCodespell
         displayName: Run Codespell script
diff --git a/.azure-pipelines/shared/generate_windows_matrix_build.py b/.azure-pipelines/shared/generate_windows_matrix_build.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

diff --git a/.azure-pipelines/shared/install_vulkan.ps1 b/.azure-pipelines/shared/install_vulkan.ps1
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 if (-not $env:VULKAN_SDK_VERSION) {

diff --git a/.azure-pipelines/shared/organize_windows_artifacts.py b/.azure-pipelines/shared/organize_windows_artifacts.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

diff --git a/.azure-pipelines/shared/print_windows_artifact_names.py b/.azure-pipelines/shared/print_windows_artifact_names.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 from itertools import product

diff --git a/.azure-pipelines/shared/shared.py b/.azure-pipelines/shared/shared.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 The Khronos Group Inc.
+# Copyright (c) 2019-2024, The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 import json

diff --git a/.editorconfig b/.editorconfig
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 

diff --git a/.env b/.env
@@ -0,0 +1,6 @@
+# Copyright (c) 2022-2024, The Khronos Group Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+# Improves the Python editing experience with vscode.
+PYTHONPATH=specification/scripts:src/scripts:external/python
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -1,4 +1,4 @@
-# Copyright 2021-2023, The Khronos Group Inc. Inc.
+# Copyright 2021-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: CC-BY-4.0
 
@@ -9,8 +9,12 @@
 # and do try to make sure that the bulk change is made
 # **separate from a release commit** on all repos.
 # See <https://git-scm.com/docs/git-blame#Documentation/git-blame.txt---ignore-revs-fileltfilegt>
-# for how to use this.
+# for how to use this, probably something like:
+# git config blame.ignoreRevsFile .git-blame-ignore-revs
 
+## Old changes
+0c93c42891ad6b95aee81709398ded7416c9f397
+767537d9523253de1615b01450a8b22c8e2cc6a2
 
 ## 1.0.17 - Fix XML indentation
 
@@ -61,3 +65,11 @@ e774b36cfc7bfc721e97de6c8435fcb14866e6fa
 
 # OpenXR-SDK
 db11d03216666f2b574da46a39c4b565dbe90124
+
+## 1.1.40 - Update to clang-format-14
+
+# Khronos GitLab
+22ba5c7abe1f43122d1eedebc093008d03aaad03
+
+# OpenXR-CTS
+e3ab3214c1307d60642ee939739740f5111bbb54
diff --git a/.gitattributes b/.gitattributes
@@ -1,4 +1,4 @@
-# Copyright (c) 2017-2023, The Khronos Group Inc.
+# Copyright (c) 2017-2024, The Khronos Group Inc.
 #
 # SPDX-License-Identifier: Apache-2.0
 
@@ -23,7 +23,11 @@
 *.sh      eol=lf
 
 *.png     binary
-*.pdf     binary
+
+# git-lfs big files
+*.pdf                    filter=lfs diff=lfs merge=lfs -text
+*.glb                    filter=lfs diff=lfs merge=lfs -text
+src/conformance/**/*.png filter=lfs diff=lfs merge=lfs -text
 
 # Shell/python scripts that don't end in .sh
 specification/makeAllExts           eol=lf